From 8ca2e2852e1e9218720697c6014a99b5e1378585 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sun, 26 May 2024 19:30:32 +0200 Subject: base-files: skip fix-group-user uci-default for APK installation For APK installation we don't have /usr/lib/opkg/info and user fixup are handled dirrectly. Skip the script in such case. Also remove this uci-defaults if we have CONFIG_USE_APK enabled. Link: https://github.com/openwrt/openwrt/pull/15543 Signed-off-by: Christian Marangi --- package/base-files/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/base-files/Makefile') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 4425bb346d..313bf377b4 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -249,6 +249,8 @@ ifneq ($(CONFIG_USE_APK),) mkdir -p $(1)/etc/apk/ $(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories) $(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories + + rm -f $(1)/etc/uci-defaults/13_fix-group-user else $(if $(CONFIG_CLEAN_IPKG),, \ mkdir -p $(1)/etc/opkg; \ -- cgit v1.2.3