image: apk: remove explicit distfeeds handling
authorPetr Štetiar <ynezz@true.cz>
Sun, 17 Nov 2024 06:50:05 +0000 (06:50 +0000)
committerJonas Gorski <jonas.gorski@gmail.com>
Sun, 17 Nov 2024 10:57:45 +0000 (11:57 +0100)
commitbdfae5a16679b41746b836a8f5dee66d1c778e41
tree6d80ab25ff5dff3a8b6edcb86337ed3d089d8e34
parentafffcd09e5f15be53f327a80ee87d391312eb805
image: apk: remove explicit distfeeds handling

Currently the build fails due to the following:

 mv: cannot stat 'linux-mediatek_filogic/target-dir-7872e783/etc/apk/repositories': No such file or directory

as the changes done in the commit e031dab93ec3 ("base-files: move apk
distfeeds into directory") forget to adapt image generation part.

While looking into this, I've realized, that we don't need this explicit
handling in the image generating code since the feeds are solely
configured by `base-files` and `apk` packages, so those should always
provide the correct feeds content, so lets simply drop this unnecessary
code.

Moving away /etc/opkg is done to prevent opkg from picking up the remote
feeds defined from base-files and only use the local feeds, but for apk
we explicitly pass --repositories-file which disables parsing of
/etc/apk/repositories and /etc/apk/repositories.d, so we do not need to
backup anything.

Fixes: #16981
Fixes: e031dab93ec3 ("base-files: move apk distfeeds into directory")
Reported-by: Chen Minqiang <ptpt52@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
[jonas.gorski: add an explicit explanation where the original mv comes
from and why we don't need it for apk].
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
include/image.mk