mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

build: reduce cleanup binary calls in rootfs.mk 

Both `find` and `rm` only need to be called once for folders and files.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2020-09-21 12:43:43 -10:00
parent 28a9ac74cc
commit 173ea745ab
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/rootfs.mk
View File

@ -47,7 +47,7 @@ TARGET_DIR_ORIG := $(TARGET_ROOTFS_DIR)/root.orig-$(BOARD)
ifdef CONFIG_CLEAN_IPKG ifdef CONFIG_CLEAN_IPKG
define clean_ipkg define clean_ipkg
-find $(1)/usr/lib/opkg/info -type f -and -not -name '*.control' | $(XARGS) rm -rf -find $(1)/usr/lib/opkg/info -type f -and -not -name '*.control' -delete
-sed -i -ne '/^Require-User: /p' $(1)/usr/lib/opkg/info/*.control -sed -i -ne '/^Require-User: /p' $(1)/usr/lib/opkg/info/*.control
awk ' \ awk ' \
BEGIN { conffiles = 0; print "Conffiles:" } \ BEGIN { conffiles = 0; print "Conffiles:" } \
@ -56,7 +56,7 @@ ifdef CONFIG_CLEAN_IPKG
conffiles == 1 { print } \ conffiles == 1 { print } \
' $(1)/usr/lib/opkg/status >$(1)/usr/lib/opkg/status.new ' $(1)/usr/lib/opkg/status >$(1)/usr/lib/opkg/status.new
mv $(1)/usr/lib/opkg/status.new $(1)/usr/lib/opkg/status mv $(1)/usr/lib/opkg/status.new $(1)/usr/lib/opkg/status
-find $(1)/usr/lib/opkg -empty | $(XARGS) rm -rf -find $(1)/usr/lib/opkg -empty -delete
endef endef
endif endif
@ -88,15 +88,13 @@ define prepare_rootfs
done || true \ done || true \
) )
$(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status) $(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status)
@-find $(1) -name CVS | $(XARGS) rm -rf @-find $(1) -name CVS -o -name .svn -o -name .git -o -name '.#*' | $(XARGS) rm -rf
@-find $(1) -name .svn | $(XARGS) rm -rf rm -rf \
@-find $(1) -name .git | $(XARGS) rm -rf $(1)/boot \
@-find $(1) -name '.#*' | $(XARGS) rm -f $(1)/tmp/* \
rm -rf $(1)/tmp/* $(1)/usr/lib/opkg/info/*.postinst* \
rm -f $(1)/usr/lib/opkg/lists/* $(1)/usr/lib/opkg/lists/* \
rm -f $(1)/usr/lib/opkg/info/*.postinst* $(1)/var/lock/*.lock
rm -f $(1)/var/lock/*.lock
rm -rf $(1)/boot
$(call clean_ipkg,$(1)) $(call clean_ipkg,$(1))
$(call mklibs,$(1)) $(call mklibs,$(1))
$(if $(SOURCE_DATE_EPOCH),find $(1)/ -mindepth 1 -execdir touch -hcd "@$(SOURCE_DATE_EPOCH)" "{}" +) $(if $(SOURCE_DATE_EPOCH),find $(1)/ -mindepth 1 -execdir touch -hcd "@$(SOURCE_DATE_EPOCH)" "{}" +)