ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-21 06:33:41 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

base-files: skip fix-group-user uci-default for APK installation

Browse Source 
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 <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-05-26 19:30:32 +02:00
parent 9f6fc4f524
commit 8ca2e2852e
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

@ -249,6 +249,8 @@ ifneq ($(CONFIG_USE_APK),)
mkdir -p $(1)/etc/apk/ mkdir -p $(1)/etc/apk/
$(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories) $(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories)
$(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories $(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories
rm -f $(1)/etc/uci-defaults/13_fix-group-user
else else
$(if $(CONFIG_CLEAN_IPKG),, \ $(if $(CONFIG_CLEAN_IPKG),, \
mkdir -p $(1)/etc/opkg; \ mkdir -p $(1)/etc/opkg; \

3
package/base-files/files/etc/uci-defaults/13_fix-group-user
View File

@ -1,5 +1,8 @@
. /lib/functions.sh . /lib/functions.sh
# Skip if we don't have /usr/lib/opkg/info (APK installation)
[ -d /usr/lib/opkg/info ] || exit 0
for file in $(grep -sl Require-User /usr/lib/opkg/info/*.control); do for file in $(grep -sl Require-User /usr/lib/opkg/info/*.control); do
file="${file##*/}" file="${file##*/}"
file="${file%.control}" file="${file%.control}"