r2727 - in jhalfs/branches/experimental: CLFS HLFS LFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat May 27 11:45:18 PDT 2006


Author: manuel
Date: 2006-05-27 12:45:16 -0600 (Sat, 27 May 2006)
New Revision: 2727

Modified:
   jhalfs/branches/experimental/CLFS/config
   jhalfs/branches/experimental/HLFS/config
   jhalfs/branches/experimental/LFS/config
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/common/func_validate_configs.sh
Log:
Merged r2726 from trunk.

Modified: jhalfs/branches/experimental/CLFS/config
===================================================================
--- jhalfs/branches/experimental/CLFS/config	2006-05-27 18:40:01 UTC (rev 2726)
+++ jhalfs/branches/experimental/CLFS/config	2006-05-27 18:45:16 UTC (rev 2727)
@@ -49,6 +49,10 @@
 #    NOTE: this setting is required
 BOOT_CONFIG=
 
+# Get the kernel package and patches even if no configutation file
+# has been supplied? 0(no)/1(yes)
+GETKERNEL=0
+
 #--- Book's sources directory
 # If you have previously checked out the book from the repository
 BOOK=

Modified: jhalfs/branches/experimental/HLFS/config
===================================================================
--- jhalfs/branches/experimental/HLFS/config	2006-05-27 18:40:01 UTC (rev 2726)
+++ jhalfs/branches/experimental/HLFS/config	2006-05-27 18:45:16 UTC (rev 2727)
@@ -19,6 +19,10 @@
 # If no config file is  specified the kernel is NOT compiled
 CONFIG=
 
+# Get the kernel package and patches even if no configutation file
+# has been supplied? 0(no)/1(yes)
+GETKERNEL=0
+
 #--- Book's sources directory
 # If you have previously checked out the book from the repository
 BOOK=

Modified: jhalfs/branches/experimental/LFS/config
===================================================================
--- jhalfs/branches/experimental/LFS/config	2006-05-27 18:40:01 UTC (rev 2726)
+++ jhalfs/branches/experimental/LFS/config	2006-05-27 18:45:16 UTC (rev 2727)
@@ -13,6 +13,10 @@
 # If no config file is  specified the kernel is NOT compiled
 CONFIG=
 
+# Get the kernel package and patches even if no configutation file
+# has been supplied? 0(no)/1(yes)
+GETKERNEL=0
+
 #--- Book's sources directory
 # If you have previously checked out the book from the repository
 BOOK=

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-05-27 18:40:01 UTC (rev 2726)
+++ jhalfs/branches/experimental/common/common-functions	2006-05-27 18:45:16 UTC (rev 2727)
@@ -624,7 +624,8 @@
             [[ "$VIMLANG" = "0" ]] && continue
           ;;
         *linux/linux-* )
-            [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && continue
+            [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && \
+            [[ "$GETKERNEL" = "0" ]] && continue
           ;;
     esac
 

Modified: jhalfs/branches/experimental/common/func_validate_configs.sh
===================================================================
--- jhalfs/branches/experimental/common/func_validate_configs.sh	2006-05-27 18:40:01 UTC (rev 2726)
+++ jhalfs/branches/experimental/common/func_validate_configs.sh	2006-05-27 18:45:16 UTC (rev 2727)
@@ -84,9 +84,9 @@
 inline_doc
 
   # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
-  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
-  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
-  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
+  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP         PAGE TIMEZONE LANG LC_ALL"
+  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
+  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL        VIMLANG PAGE TIMEZONE LANG"
 
   local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
   local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
@@ -172,6 +172,9 @@
 
       # Validate general parameters..
       GETPKG)     validate_against_str "x0x x1x" ;;
+      GETKERNEL ) if [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] ; then
+                    [[ "$GETPKG" = "1" ]] && validate_against_str "x0x x1x"
+                  fi ;;
       RUNMAKE)    validate_against_str "x0x x1x" ;;
       REPORT)     validate_against_str "x0x x1x"
                   if [[ "${!config_param}" = "1" ]]; then




More information about the alfs-log mailing list