include/rootfs.mk: keep Require-User lines with CONFIG_CLEAN_IPKG
Require-User is handled by /etc/uci-defaults/13_fix_group_user on first boot, so we need to keep these when removing all opkg data with CONFIG_CLEAN_IPKG. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
parent
4376e69473
commit
7e1fc09c4f
1 changed files with 9 additions and 1 deletions
|
@ -47,6 +47,14 @@ opkg = \
|
||||||
|
|
||||||
TARGET_DIR_ORIG := $(TARGET_ROOTFS_DIR)/root.orig-$(BOARD)
|
TARGET_DIR_ORIG := $(TARGET_ROOTFS_DIR)/root.orig-$(BOARD)
|
||||||
|
|
||||||
|
ifdef CONFIG_CLEAN_IPKG
|
||||||
|
define clean_ipkg
|
||||||
|
-find $(1)/usr/lib/opkg -type f -and -not -name '*.control' | $(XARGS) rm -rf
|
||||||
|
-sed -i -ne '/^Require-User: /p' $(1)/usr/lib/opkg/info/*.control
|
||||||
|
-find $(1)/usr/lib/opkg -empty | $(XARGS) rm -rf
|
||||||
|
endef
|
||||||
|
endif
|
||||||
|
|
||||||
define prepare_rootfs
|
define prepare_rootfs
|
||||||
@if [ -d $(TOPDIR)/files ]; then \
|
@if [ -d $(TOPDIR)/files ]; then \
|
||||||
$(call file_copy,$(TOPDIR)/files/.,$(1)); \
|
$(call file_copy,$(TOPDIR)/files/.,$(1)); \
|
||||||
|
@ -75,6 +83,6 @@ define prepare_rootfs
|
||||||
rm -f $(1)/usr/lib/opkg/lists/*
|
rm -f $(1)/usr/lib/opkg/lists/*
|
||||||
rm -f $(1)/usr/lib/opkg/info/*.postinst*
|
rm -f $(1)/usr/lib/opkg/info/*.postinst*
|
||||||
rm -f $(1)/usr/lib/opkg/info/*.prerm*
|
rm -f $(1)/usr/lib/opkg/info/*.prerm*
|
||||||
$(if $(CONFIG_CLEAN_IPKG),rm -rf $(1)/usr/lib/opkg)
|
$(call clean_ipkg,$(1))
|
||||||
$(call mklibs,$(1))
|
$(call mklibs,$(1))
|
||||||
endef
|
endef
|
||||||
|
|
Loading…
Reference in a new issue