diff --git a/CLFS/config b/CLFS/config index 71122a1..3244e19 100644 --- a/CLFS/config +++ b/CLFS/config @@ -13,7 +13,7 @@ declare -r FTP=ftp://ftp.linuxfromscratch.org/pub/lfs/conglomeration 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 @@ TARGET= # 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" diff --git a/common/func_validate_configs.sh b/common/func_validate_configs.sh index 7c481b6..b98dcb0 100644 --- a/common/func_validate_configs.sh +++ b/common/func_validate_configs.sh @@ -93,10 +93,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 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 \${OFF}' diff --git a/master.sh b/master.sh index 62e29a0..10df8fc 100755 --- a/master.sh +++ b/master.sh @@ -414,6 +414,7 @@ BOOK=${BOOK:=$PROGNAME-$LFSVRS} # 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"