[openwrt/openwrt] base-files: move apk distfeeds into directory

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/e031dab93ec3a066880ff25e0f42d6bef1e3001a

commit e031dab93ec3a066880ff25e0f42d6bef1e3001a
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Wed Nov 13 14:25:26 2024 +0100

    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 at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/16940
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 package/base-files/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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