aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2020-09-21 12:43:43 -1000
committerPaul Spooren <mail@aparcar.org>2020-12-05 22:07:00 -1000
commit173ea745abd27d2d8eb1b0f571069ddfd7f24641 (patch)
tree82bdc5798c674844f7a1868f59b0c178f96a0d0f /include
parent28a9ac74ccd5af67c033f86665fd2aad87778efa (diff)
downloadupstream-173ea745abd27d2d8eb1b0f571069ddfd7f24641.tar.gz
upstream-173ea745abd27d2d8eb1b0f571069ddfd7f24641.tar.bz2
upstream-173ea745abd27d2d8eb1b0f571069ddfd7f24641.zip
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>
Diffstat (limited to 'include')
-rw-r--r--include/rootfs.mk20
1 files changed, 9 insertions, 11 deletions
diff --git a/include/rootfs.mk b/include/rootfs.mk
index 18ada3cd43..f2ed648d2f 100644
--- a/include/rootfs.mk
+++ b/include/rootfs.mk
@@ -47,7 +47,7 @@ TARGET_DIR_ORIG := $(TARGET_ROOTFS_DIR)/root.orig-$(BOARD)
ifdef CONFIG_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
awk ' \
BEGIN { conffiles = 0; print "Conffiles:" } \
@@ -56,7 +56,7 @@ ifdef CONFIG_CLEAN_IPKG
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
+ -find $(1)/usr/lib/opkg -empty -delete
endef
endif
@@ -88,15 +88,13 @@ define prepare_rootfs
done || true \
)
$(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 .svn | $(XARGS) rm -rf
- @-find $(1) -name .git | $(XARGS) rm -rf
- @-find $(1) -name '.#*' | $(XARGS) rm -f
- rm -rf $(1)/tmp/*
- rm -f $(1)/usr/lib/opkg/lists/*
- rm -f $(1)/usr/lib/opkg/info/*.postinst*
- rm -f $(1)/var/lock/*.lock
- rm -rf $(1)/boot
+ @-find $(1) -name CVS -o -name .svn -o -name .git -o -name '.#*' | $(XARGS) rm -rf
+ rm -rf \
+ $(1)/boot \
+ $(1)/tmp/* \
+ $(1)/usr/lib/opkg/info/*.postinst* \
+ $(1)/usr/lib/opkg/lists/* \
+ $(1)/var/lock/*.lock
$(call clean_ipkg,$(1))
$(call mklibs,$(1))
$(if $(SOURCE_DATE_EPOCH),find $(1)/ -mindepth 1 -execdir touch -hcd "@$(SOURCE_DATE_EPOCH)" "{}" +)