[jhalfs] 06/06: Account for the new nummber of "chapterxx" dirs

This is a multi-part message in MIME format...

------------=_1777135626-2136-26091
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository jhalfs.

commit b94713fec6a7b8f15932bbaf116ea9266aaea4f8
Author: Pierre Labastie <[email protected]>
AuthorDate: Sat Apr 25 15:35:35 2026 +0200

    Account for the new nummber of "chapterxx" dirs
    
    We have added one chapter, so "nb_chaps" is increased by one.
    Change the tests in consequence. We also prevent creating
    an entry for the "reboot" scriptlet in Makefile (done
    manually).
---
 LFS/master.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/LFS/master.sh b/LFS/master.sh
index 52ea8da..1178135 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -51,12 +51,15 @@ chapter_targets() {       #
     #   in this case
     # - do not reinstall linux-headers when rebuilding
     # - grub config: must be done manually; skip it
+    # - reboot: same
     # - handle fstab and .config. Skip kernel if .config not supplied
     case "${this_script}" in
       *stripping*)     [[ "${STRIP}" = "n" ]] && continue ;;
       *linux-headers*) [[ -n "$N" ]] && continue ;;
-      8*grub)          (( nb_chaps == 5 )) && continue ;;
+      8*grub)          (( nb_chaps == 6 )) && continue ;;
       10*grub)         continue ;;
+      9*reboot)        (( nb_chaps == 6 )) && continue ;;
+      11*reboot)       continue ;;
       *fstab)          [[ -z "${FSTAB}" ]] ||
                        [[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
                        cp ${FSTAB} $BUILDDIR/sources/fstab ;;
@@ -114,7 +117,7 @@ chapter_targets() {       #
       # Touch timestamp file if installed files logs shall be created.
       # But only for the final install chapter and not when rebuilding it
       if [ "${INSTALL_LOG}" = "y" ] &&
-         (( 1+nb_chaps <= $1 )) &&
+         (( nb_chaps <= $1 )) &&
          [ "x$N" = x ] ; then
         CHROOT_wrt_TouchTimestamp
       fi
@@ -127,7 +130,7 @@ chapter_targets() {       #
 
       # If using optimizations, write the instructions
       case "${OPTIMIZE}$1${nb_chaps}${this_script}${REALSBU}" in
-          0* | *binutils-pass1y | 15* | 167* | 177*) ;;
+          0* | *binutils-pass1y | 15* | 168* | 178*) ;;
           *kernel*) ;; # No CFLAGS for kernel
           *)  wrt_optimize "$name" ;;
       esac
@@ -193,7 +196,7 @@ EOF
     # except if the package build fails.
     if [ "$pkg_tarball" != "" ] ; then
       if [ "${INSTALL_LOG}" = "y" ] &&
-         (( 1+nb_chaps <= $1 )) &&
+         (( nb_chaps <= $1 )) &&
          [ "x${N}" = "x" ] ; then
         CHROOT_wrt_LogNewFiles "${this_script}"
       fi
@@ -210,7 +213,7 @@ EOF
     # Keep the script file name for Makefile dependencies.
     PREV=${this_script}
     # Set "system_build" var for iteration targets
-    if [ -z "$N" ] && (( 1+nb_chaps == $1 )); then
+    if [ -z "$N" ] && (( nb_chaps == $1 )); then
       system_build="$system_build $this_script"
     fi
 
@@ -244,7 +247,7 @@ build_Makefile() {           #
   # We need to know the chapter numbering, which depends on the version
   # of the book. Use the number of subdirs to know which version we have
   chaps=($(echo chapter*))
-  nb_chaps=${#chaps[*]} # 5 if classical version, 7 if new version
+  nb_chaps=${#chaps[*]} # 6 if classical version, 8 if new version
 # DEBUG
 #  echo chaps: ${chaps[*]}
 #  echo nb_chaps: $nb_chaps
@@ -253,11 +256,11 @@ build_Makefile() {           #
   # Make a temporary file with all script targets
   for (( i = 4; i < nb_chaps+4; i++ )); do
     chapter_targets $i
-    if (( i ==  nb_chaps )); then : # we have finished temporary tools
+    if (( i ==  nb_chaps - 1 )); then : # we have finished temporary tools
       # Add the save target, if needed
       [[ "$SAVE_CH5" = "y" ]] && wrt_save_target $Makefile_target
     fi
-    if (( i ==  1+nb_chaps )); then : # we have finished final system
+    if (( i ==  nb_chaps )); then : # we have finished final system
       # Add the iterations targets, if needed
       [[ "$COMPARE" = "y" ]] && wrt_compare_targets $i
     fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

------------=_1777135626-2136-26091
Content-Type: text/plain; charset="UTF-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page
------------=_1777135626-2136-26091--