From 3f858cab768250abbccc08ebacad88ec830f4890 Mon Sep 17 00:00:00 2001
From: George Boudreau <georgeb@linuxfromscratch.org>
Date: Fri, 10 Mar 2006 14:27:12 +0000
Subject: [PATCH] Housekeeping only

---
 LFS/master.sh                   | 36 ++++++++++++++++++++++++++-------
 common/func_validate_configs.sh |  6 +++---
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/LFS/master.sh b/LFS/master.sh
index 9636107..6076130 100755
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -91,6 +91,10 @@ chapter5_Makefiles() {
     # Set the dependency for the first target.
     if [ -z $PREV ] ; then PREV=022-settingenvironment ; fi
 
+    #--------------------------------------------------------------------#
+    #         >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<          #
+    #--------------------------------------------------------------------#
+    #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
     wrt_target "${this_script}" "$PREV"
@@ -107,8 +111,7 @@ chapter5_Makefiles() {
         FILE="$name-$vrs.tar"
       fi
 
-      # Insert instructions for unpacking the package and to set
-      # the PKGDIR variable.
+      # Insert instructions for unpacking the package and to set the PKGDIR variable.
       wrt_unpack "$FILE"
       echo -e '\ttrue' >> $MKFILE.tmp
     fi
@@ -126,6 +129,10 @@ chapter5_Makefiles() {
     # Include a touch of the target name so make can check
     # if it's already been made.
     echo -e '\t@touch $@' >> $MKFILE.tmp
+    #
+    #--------------------------------------------------------------------#
+    #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
+    #--------------------------------------------------------------------#
 
     # Keep the script file name for Makefile dependencies.
     PREV=${this_script}
@@ -158,6 +165,10 @@ chapter6_Makefiles() {
     # Grab the name of the target
     name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
 
+    #--------------------------------------------------------------------#
+    #         >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<          #
+    #--------------------------------------------------------------------#
+    #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
     wrt_target "${this_script}" "$PREV"
@@ -173,11 +184,10 @@ chapter6_Makefiles() {
       wrt_unpack2 "$FILE"
     fi
 
-    if [[ `_IS_ ${this_script} glibc` ]] ; then  # For Glibc we need to set TIMEZONE envar.
-      wrt_export_timezone
-    elif [[ `_IS_ ${this_script} groff` ]] ; then  # For Groff we need to set PAGE envar.
-      wrt_export_pagesize
-    fi
+    case "${this_script}" in
+      *glibc*  ) wrt_export_timezone ;; # For Glibc we need to set TIMEZONE envar.
+      *groff*  ) wrt_export_pagesize ;; # For Groff we need to set PAGE envar.
+    esac
 
     # In the mount of kernel filesystems we need to set LFS
     # and not to use chroot.
@@ -195,6 +205,10 @@ chapter6_Makefiles() {
     # Include a touch of the target name so make can check
     # if it's already been made.
     echo -e '\t@touch $@' >> $MKFILE.tmp
+    #
+    #--------------------------------------------------------------------#
+    #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
+    #--------------------------------------------------------------------#
 
     # Keep the script file name for Makefile dependencies.
     PREV=${this_script}
@@ -226,6 +240,10 @@ chapter789_Makefiles() {
     # the names of the targets in the Makefile
     chapter789="$chapter789 ${this_script}"
 
+    #--------------------------------------------------------------------#
+    #         >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<          #
+    #--------------------------------------------------------------------#
+    #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
     wrt_target "${this_script}" "$PREV"
@@ -267,6 +285,10 @@ EOF
     # Include a touch of the target name so make can check
     # if it's already been made.
     echo -e '\t@touch $@' >> $MKFILE.tmp
+    #
+    #--------------------------------------------------------------------#
+    #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
+    #--------------------------------------------------------------------#
 
     # Keep the script file name for Makefile dependencies.
     PREV=${this_script}
diff --git a/common/func_validate_configs.sh b/common/func_validate_configs.sh
index 452afe2..9e2097b 100644
--- a/common/func_validate_configs.sh
+++ b/common/func_validate_configs.sh
@@ -17,10 +17,10 @@ validate_config()    {       # Are the config values sane (within reason)
     on success: write text to console and returns
 inline_doc
 
-  local -r  lfs_PARAM_LIST="BUILDDIR HPKG TEST STRIP VIMLANG PAGE RUNMAKE"
+  local -r  lfs_PARAM_LIST=""
   local -r blfs_PARAM_LIST="BUILDDIR TEST DEPEND"
-  local -r hlfs_PARAM_LIST="BUILDDIR HPKG MODEL TEST STRIP VIMLANG PAGE GRSECURITY_HOST RUNMAKE TIMEZONE"
-  local -r clfs_PARAM_LIST="ARCH BOOTMINIMAL RUNMAKE MKFILE"
+  local -r hlfs_PARAM_LIST="MODEL GRSECURITY_HOST"
+  local -r clfs_PARAM_LIST="ARCH BOOTMINIMAL"
   local -r global_PARAM_LIST="BUILDDIR HPKG RUNMAKE TEST STRIP PAGE TIMEZONE VIMLANG"
 
   local -r ERROR_MSG='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid, ${nl_}check the config file ${BOLD}${GREEN}\<$PROGNAME.conf\>${OFF}'