From: Jonas Gorski Date: Wed, 13 Nov 2024 13:25:26 +0000 (+0100) Subject: base-files: move apk distfeeds into directory X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e031dab93ec3a066880ff25e0f42d6bef1e3001a;p=openwrt%2Fopenwrt.git base-files: move apk distfeeds into directory Analog to how we handle distfeeds with opkg, have the base feeds defined in a file in repositories.d instead of the base /etc/apk/repositories. Signed-off-by: Jonas Gorski Link: https://github.com/openwrt/openwrt/pull/16940 Signed-off-by: Christian Marangi --- diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7ac4ea557f..2725bcb90b 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -250,9 +250,9 @@ endif rm -f $(1)/etc/banner.failsafe,) ifneq ($(CONFIG_USE_APK),) - mkdir -p $(1)/etc/apk/ - $(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories) - $(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories + mkdir -p $(1)/etc/apk/repositories.d + $(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories.d/distfeeds.list) + $(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories.d/distfeeds.list rm -f $(1)/etc/uci-defaults/13_fix-group-user rm -f $(1)/sbin/pkg_check