Changeset f5ecc28

Timestamp:

05/01/2020 02:24:32 PM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

38016d5

Parents:

06eddf4

Message:

Add code to save work at the end of chapter 5
(and finish the rebuild-makefile change)

Files:

• Config.in (modified) (1 diff)
• LFS/master.sh (modified) (2 diffs)
• common/libs/func_compare.sh (modified) (1 diff)
• common/libs/func_validate_configs.sh (modified) (1 diff)
• jhalfs (modified) (2 diffs)

Config.in

@@ -1078 +1078 @@
 
 menu "Advanced Features"
-depends on !BOOK_BLFS
+depends on !BOOK_BLFS && !REBUILD_MAKEFILE
 
     config    REPORT
         bool "Create SBU and disk usage report"
         default y
+
+    config    SAVE_CH5
+        bool "Save Chapter 5 work"
+        depends on BOOK_LFS || BOOK_LFS_SYSD
+        default n
+        help
+            Save the state of jhalfs at the end of chapter 5:
+            
+            if you tick this item, the whole $LFS directory is
+            saved when chapter 5 is finished. It'll be in an xz
+            compressed tarball in the $LFS/jhalfs directory
 
     #--- ICA

LFS/master.sh

@@ -101 +101 @@
 # For vanilla lfs, the "changingowner" script should be run as root. So
 # it belongs to the "SUDO" target, with list in the "runasroot" variable.
-# For new lfs, changingowner and kernfs are in "runsaroot", then the following,
+# For new lfs, changingowner and kernfs are in "runasroot", then the following,
 # starting at creatingdirs, are in the "CHROOT" target, in variable "chapter6".
 # Makefile_target records the variable, not really the target!
@@ -442 +442 @@
   chapter4_Makefiles
   chapter5_Makefiles
+  # Add the save target, if needed
+  [[ "$SAVE_CH5" = "y" ]] && wrt_save_target $Makefile_target
   chapter6_Makefiles
   # Add the iterations targets, if needed

common/libs/func_compare.sh

@@ -54 +54 @@
   local   PREV_IT=$2
   local PRUNEPATH="/dev /home /${SCRIPT_ROOT} /lost+found /media /mnt /opt /proc \
-/sources /root /srv /sys /tmp /tools /usr/local /usr/src"
+/sources /root /run /srv /sys /tmp /tools /usr/local /usr/src /var"
 
   local    ROOT_DIR=/

common/libs/func_validate_configs.sh

@@ -52 +52 @@
 
   # Full list of books settings
-  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build $LFS_system  $ADVANCED_chroot REALSBU $ADVANCED_common"
+  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build $LFS_system  $ADVANCED_chroot REALSBU SAVE_CH5 $ADVANCED_common"
   local -r  hlfs_PARAM_LIST="$HLFS_book  $GENERAL_common $HLFS_build  $ADVANCED_chroot $ADVANCED_common"
   local -r  clfs_PARAM_LIST="$CLFS_book  $GENERAL_common $CLFS_build  $ADVANCED_chroot $ADVANCED_common"

jhalfs

@@ -179 +179 @@
 LOCAL=${LOCAL:=n}
 REALSBU=${REALSBU:=n}
+SAVE_CH5=${SAVE_CH5:=n}
 
 if [[ "${NO_PROGRESS_BAR}" = "y" ]] ; then
@@ -355 +356 @@
 fi
 #
+# save module
+if [[ "$SAVE_CH5" = "y" ]]; then
+  load_file "${COMMON_DIR}/libs/func_save.sh" 'Loading save module'
+fi
+#
 # optimize module
 if [[ "$OPTIMIZE" != "0" ]]; then