summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski2024-11-13 13:25:26 +0000
committerChristian Marangi2024-11-16 16:26:27 +0000
commite031dab93ec3a066880ff25e0f42d6bef1e3001a (patch)
treef97428f7307d0f8f94bb6c54a6b04e9354151bd2
parent8f6972df36a520738083dc48eac69b778fbc814e (diff)
downloadopenwrt-e031dab93ec3a066880ff25e0f42d6bef1e3001a.tar.gz
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>
-rw-r--r--package/base-files/Makefile6
1 files 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