[openwrt/openwrt] base-files: reduce number of `mkdir` calls

LEDE Commits lede-commits at lists.infradead.org
Fri Sep 24 00:43:12 PDT 2021


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/70543aafb29a79613ac9b49ec41e51e42fa598ac

commit 70543aafb29a79613ac9b49ec41e51e42fa598ac
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Sat Sep 11 22:46:06 2021 -1000

    base-files: reduce number of `mkdir` calls
    
    The `mkdir` commands supports passing multiple arguments to batch create
    multiple folders, instead of calling the tool every single time.
    
    If the creation of one of the folders fails, all other folder are still
    created and therefore doesn't change the error handling.
    
    Also stop creating `/etc/` explicitly after subfolders of `/etc/` were
    already created.
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 package/base-files/Makefile | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f87fd0fe6a..af5c0e6b00 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -161,24 +161,27 @@ define Package/base-files/install
 		$(1)/etc/preinit \
 		$(1)/etc/profile
 
-	mkdir -p $(1)/CONTROL
-	mkdir -p $(1)/dev
-	mkdir -p $(1)/etc/config
-	mkdir -p $(1)/etc/crontabs
-	mkdir -p $(1)/etc/rc.d
-	mkdir -p $(1)/overlay
-	mkdir -p $(1)/lib/firmware
+	mkdir -p \
+		$(1)/CONTROL \
+		$(1)/dev \
+		$(1)/etc/config \
+		$(1)/etc/crontabs \
+		$(1)/etc/rc.d \
+		$(1)/overlay \
+		$(1)/lib/firmware \
+		$(1)/mnt \
+		$(1)/proc \
+		$(1)/tmp \
+		$(1)/usr/lib \
+		$(1)/usr/bin \
+		$(1)/sys \
+		$(1)/www \
+		$(1)/root
+
+	$(LN) /proc/mounts $(1)/etc/mtab
 	$(if $(LIB_SUFFIX),-$(LN) lib $(1)/lib$(LIB_SUFFIX))
-	mkdir -p $(1)/mnt
-	mkdir -p $(1)/proc
-	mkdir -p $(1)/tmp
-	mkdir -p $(1)/usr/lib
 	$(if $(LIB_SUFFIX),-$(LN) lib $(1)/usr/lib$(LIB_SUFFIX))
-	mkdir -p $(1)/usr/bin
-	mkdir -p $(1)/sys
-	mkdir -p $(1)/www
-	mkdir -p $(1)/root
-	$(LN) /proc/mounts $(1)/etc/mtab
+
 ifneq ($(CONFIG_TARGET_ROOTFS_PERSIST_VAR),y)
 	rm -f $(1)/var
 	$(LN) tmp $(1)/var
@@ -186,7 +189,6 @@ else
 	mkdir -p $(1)/var
 	$(LN) /tmp/run $(1)/var/run
 endif
-	mkdir -p $(1)/etc
 	$(LN) /tmp/resolv.conf /tmp/TZ /tmp/localtime $(1)/etc/
 
 	chmod 0600 $(1)/etc/shadow



More information about the lede-commits mailing list