From: Matthias Schiffer Date: Tue, 6 Mar 2018 13:29:46 +0000 (+0100) Subject: include/rootfs.mk: retain list of conffiles with CONFIG_CLEAN_IPKG X-Git-Tag: v17.01.5~64 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=75be005e8bdcbf86f9ad167a8737126dda98a444;p=oweals%2Fopenwrt.git include/rootfs.mk: retain list of conffiles with CONFIG_CLEAN_IPKG /usr/lib/opkg/status must not be removed completely, otherwise the packages' conffile lists will be missing. Replace it with a reduced version only containing the conffile entries. Signed-off-by: Matthias Schiffer --- diff --git a/include/rootfs.mk b/include/rootfs.mk index dc400a05ed..816f17b80d 100644 --- a/include/rootfs.mk +++ b/include/rootfs.mk @@ -49,8 +49,15 @@ 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 + -find $(1)/usr/lib/opkg/info -type f -and -not -name '*.control' | $(XARGS) rm -rf -sed -i -ne '/^Require-User: /p' $(1)/usr/lib/opkg/info/*.control + awk ' \ + BEGIN { conffiles = 0; print "Conffiles:" } \ + /^Conffiles:/ { conffiles = 1; next } \ + !/^ / { conffiles = 0; next } \ + conffiles == 1 { print } \ + ' $(1)/usr/lib/opkg/status >$(1)/usr/lib/opkg/status.new + mv $(1)/usr/lib/opkg/status.new $(1)/usr/lib/opkg/status -find $(1)/usr/lib/opkg -empty | $(XARGS) rm -rf endef endif