[source] include/rootfs.mk: keep Require-User lines with CONFIG_CLEAN_IPKG

[LEDE Commits]

neoraider pushed a commit to source.git, branch master:
https://git.lede-project.org/7e1fc09c4f2cc1656f315abaf6d3ba0eb11aa3fa

commit 7e1fc09c4f2cc1656f315abaf6d3ba0eb11aa3fa
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Tue Jan 24 17:00:43 2017 +0100

    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 at universe-factory.net>
---
 include/rootfs.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/rootfs.mk b/include/rootfs.mk
index 90d70a1..c014b1d 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