aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/Makefile
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2021-09-11 22:46:06 -1000
committerPaul Spooren <mail@aparcar.org>2021-09-23 21:40:52 -1000
commit70543aafb29a79613ac9b49ec41e51e42fa598ac (patch)
tree075e4aec782e413e3e86dfab8f77200c02a51fff /package/base-files/Makefile
parent9c331a6a91e870a1dc31f563333105e959f8b171 (diff)
downloadupstream-70543aafb29a79613ac9b49ec41e51e42fa598ac.tar.gz
upstream-70543aafb29a79613ac9b49ec41e51e42fa598ac.tar.bz2
upstream-70543aafb29a79613ac9b49ec41e51e42fa598ac.zip
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@aparcar.org>
Diffstat (limited to 'package/base-files/Makefile')
-rw-r--r--package/base-files/Makefile36
1 files 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