r2449 - in jhalfs/branches/experimental: . CLFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Tue Mar 28 19:50:34 PST 2006


Author: georgeb
Date: 2006-03-28 20:50:33 -0700 (Tue, 28 Mar 2006)
New Revision: 2449

Modified:
   jhalfs/branches/experimental/CLFS/config
   jhalfs/branches/experimental/common/func_validate_configs.sh
   jhalfs/branches/experimental/master.sh
Log:
common/func_validate_configs.sh,  shuffle the testing order for config variables. 

Modified: jhalfs/branches/experimental/CLFS/config
===================================================================
--- jhalfs/branches/experimental/CLFS/config	2006-03-29 01:35:15 UTC (rev 2448)
+++ jhalfs/branches/experimental/CLFS/config	2006-03-29 03:50:33 UTC (rev 2449)
@@ -13,7 +13,7 @@
 TARGET32=""
 TARGET=
 # >>>> 32-32 BUILD <<<<
-# ARCH=x86 ;     TARGET="i486-pc-linux-gnu"
+ ARCH=x86 ;     TARGET="i486-pc-linux-gnu"
 # ARCH=x86 ;     TARGET="i586-pc-linux-gnu"
 # ARCH=x86 ;     TARGET="i686-pc-linux-gnu"
 # ARCH=ppc ;     TARGET="powerpc-unknown-linux-gnu"
@@ -30,7 +30,7 @@
 # ARCH=alpha	  ; TARGET="alpha-unknown-linux-gnu"
 #--------------------------------
 # >>>> MULTILIB 32/64 <<<<
- ARCH=x86_64  ; TARGET="x86_64-unknown-linux-gnu"    ; TARGET32="i686-pc-linux-gnu"
+# ARCH=x86_64  ; TARGET="x86_64-unknown-linux-gnu"    ; TARGET32="i686-pc-linux-gnu"
 # ARCH=mips64  ; TARGET="mipsel-unknown-linux-gnu"    ; TARGET32="mipsel-unknown-linux-gnu"
 # ARCH=mips64  ; TARGET="mips-unknown-linux-gnu"      ; TARGET32="mips-unknown-linux-gnu"
 # ARCH=sparc64 ; TARGET="sparc64-unknown-linux-gnu"   ; TARGET32="sparcv9-unknown-linux-gnu"

Modified: jhalfs/branches/experimental/common/func_validate_configs.sh
===================================================================
--- jhalfs/branches/experimental/common/func_validate_configs.sh	2006-03-29 01:35:15 UTC (rev 2448)
+++ jhalfs/branches/experimental/common/func_validate_configs.sh	2006-03-29 03:50:33 UTC (rev 2449)
@@ -93,10 +93,10 @@
     on success: write text to console and returns
 inline_doc
 
-  local -r  lfs_PARAM_LIST="BUILDDIR SRC_ARCHIVE HPKG RUNMAKE TEST STRIP PAGE TIMEZONE VIMLANG LC_ALL LANG KEYMAP FSTAB CONFIG"
   local -r blfs_PARAM_LIST="BUILDDIR SRC_ARCHIVE TEST LANG DEPEND"
-  local -r hlfs_PARAM_LIST="BUILDDIR SRC_ARCHIVE HPKG RUNMAKE TEST STRIP PAGE TIMEZONE VIMLANG LC_ALL LANG KEYMAP FSTAB CONFIG MODEL GRSECURITY_HOST"
-  local -r clfs_PARAM_LIST="BUILDDIR SRC_ARCHIVE HPKG RUNMAKE TEST STRIP PAGE TIMEZONE VIMLANG LC_ALL LANG KEYMAP ARCH TARGET FSTAB CONFIG BOOT_CONFIG METHOD"
+  local -r hlfs_PARAM_LIST="BUILDDIR SRC_ARCHIVE TEST HPKG RUNMAKE STRIP PAGE TIMEZONE LC_ALL LANG         KEYMAP             FSTAB CONFIG MODEL GRSECURITY_HOST"
+  local -r clfs_PARAM_LIST="BUILDDIR SRC_ARCHIVE TEST HPKG RUNMAKE STRIP PAGE TIMEZONE        LANG VIMLANG KEYMAP ARCH TARGET FSTAB CONFIG BOOT_CONFIG METHOD"
+  local -r  lfs_PARAM_LIST="BUILDDIR SRC_ARCHIVE TEST HPKG RUNMAKE STRIP PAGE TIMEZONE        LANG VIMLANG                    FSTAB CONFIG"
 
   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}'

Modified: jhalfs/branches/experimental/master.sh
===================================================================
--- jhalfs/branches/experimental/master.sh	2006-03-29 01:35:15 UTC (rev 2448)
+++ jhalfs/branches/experimental/master.sh	2006-03-29 03:50:33 UTC (rev 2449)
@@ -414,6 +414,7 @@
 
 # Check for minumum gcc and kernel versions
 #check_requirements  1 # 0/1  0-do not display values.
+echo
 check_version "2.6.2" "`uname -r`"         "KERNEL"
 check_version "3.0"   "$BASH_VERSION"      "BASH"
 check_version "3.0"   "`gcc -dumpversion`" "GCC"




More information about the alfs-log mailing list