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 <jonas.gorski@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7ac4ea557f9f10d4d13407b5e8c5cb69a40df304..2725bcb90b3d22787ddf7897949833b4d319bf33 100644 (file)
--- 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