Changeset 3722d31 for LFS/master.sh

Timestamp:

10/06/2022 08:26:29 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

262e174

Parents:

87eb9e9

Message:

Call kernel filesystem scripts from Makefile

Instead of having them inside the Makefile, which implies editing
them (automatically), which is not robust if anything changes:
it got broken when a test for a mountpoint was added...

File:

• LFS/master.sh (modified) (4 diffs)

LFS/master.sh

@@ -287 +287 @@
   done
 
-  # Store virtual kernel file systems commands:
-  devices=`cat ../kernfs-scripts/devices.sh | \
-            sed -e 's|^|        |'   \
-                -e 's|mount|sudo &|' \
-                -e 's|mkdir|sudo &|' \
-                -e 's|\\$|&&|g' \
-                -e 's|\$|; \\\\|' \
-                -e 's|then|& :|' \
-                -e 's|\$\$LFS|$(MOUNT_PT)|g'`
-  teardown=`cat ../kernfs-scripts/teardown.sh | \
-            sed -e 's|^|        |'   \
-                -e 's|umount|-sudo &|' \
-                -e 's|\$LFS|$(MOUNT_PT)|'`
-  teardownat=`cat ../kernfs-scripts/teardown.sh | \
-              sed -e 's|^|      |'   \
-                  -e 's|umount|@-sudo &|' \
-                  -e 's|\$LFS|$(MOUNT_PT)|'`
   # Drop in the main target 'all:' and the chapter targets with each sub-target
   # as a dependency.
@@ -310 +293 @@
 
 all:    ck_UID ck_terminal mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL mk_CUSTOM_TOOLS
-$teardownat
+        @sudo env LFS=\$(MOUNT_PT) kernfs-scripts/teardown.sh
         @sudo make do_housekeeping
         @echo $VERSION > lfs-release && \\
@@ -395 +378 @@
 
 devices: ck_UID
-$devices
+        sudo env LFS=\$(MOUNT_PT) kernfs-scripts/devices.sh
 EOF
 ) >> $MKFILE
@@ -410 +393 @@
 
 teardown:
-$teardown
+        sudo env LFS=\$(MOUNT_PT) kernfs-scripts/teardown.sh
 
 chroot1: devices