Changeset 3f858ca

Timestamp:

03/10/2006 02:27:12 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

bef0a98

Parents:

1ce084e

Message:

Housekeeping only

Files:

• LFS/master.sh (modified) (8 diffs)
• common/func_validate_configs.sh (modified) (1 diff)

LFS/master.sh

@@ -92 +92 @@
     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.
@@ -108 +112 @@
       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
@@ -127 +130 @@
     # if it's already been made.
     echo -e '\t@touch $@' >> $MKFILE.tmp
+    #
+    #--------------------------------------------------------------------#
+    #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
+    #--------------------------------------------------------------------#
 
     # Keep the script file name for Makefile dependencies.
@@ -159 +166 @@
     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.
@@ -174 +185 @@
     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
@@ -196 +206 @@
     # if it's already been made.
     echo -e '\t@touch $@' >> $MKFILE.tmp
+    #
+    #--------------------------------------------------------------------#
+    #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
+    #--------------------------------------------------------------------#
 
     # Keep the script file name for Makefile dependencies.
@@ -227 +241 @@
     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.
@@ -268 +286 @@
     # if it's already been made.
     echo -e '\t@touch $@' >> $MKFILE.tmp
+    #
+    #--------------------------------------------------------------------#
+    #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
+    #--------------------------------------------------------------------#
 
     # Keep the script file name for Makefile dependencies.

common/func_validate_configs.sh

@@ -18 +18 @@
 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"