| 12345678910111213141516171819202122232425262728293031323334353637 |
- From: Matthias Schiffer <mschiffer@universe-factory.net>
- Date: Tue, 24 Jan 2017 17:00:43 +0100
- Subject: 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>
- diff --git a/include/rootfs.mk b/include/rootfs.mk
- index 90d70a11f2e775c83b9907ec1f296c0e4d535ad6..c014b1d14ab0963687417809431abc0bf314830c 100644
- --- a/include/rootfs.mk
- +++ b/include/rootfs.mk
- @@ -47,6 +47,14 @@ opkg = \
-
- 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
- @if [ -d $(TOPDIR)/files ]; then \
- $(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/info/*.postinst*
- 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))
- endef
|
