r2386 - in jhalfs/branches/experimental: CLFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Tue Mar 21 15:25:42 PST 2006


Author: georgeb
Date: 2006-03-21 16:25:40 -0700 (Tue, 21 Mar 2006)
New Revision: 2386

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
   jhalfs/branches/experimental/common/func_validate_configs.sh
Log:
CLFS, manipulation of BOOT_CONFIG in CLFS/master.sh and common/func_validate_configs.sh

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-03-21 22:36:14 UTC (rev 2385)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-03-21 23:25:40 UTC (rev 2386)
@@ -219,8 +219,8 @@
       *kernel)    # if there is no kernel config file do not build the kernel
                 [[ -z $CONFIG ]] && continue
                   # Copy the config file to /sources with a standardized name
-                cp $CONFIG $BUILDDIR/sources/kernel-config
-                sed "s|make mrproper|make mrproper\ncp /sources/kernel-config .config|" -i $file
+                cp $BOOT_CONFIG $BUILDDIR/sources/bootkernel-config
+                sed "s|make mrproper|make mrproper\ncp /sources/bootkernel-config .config|" -i $file
                   # You cannot run menuconfig from within the makefile
                 sed 's|menuconfig|oldconfig|'     -i $file
                   #If defined include the keymap in the kernel

Modified: jhalfs/branches/experimental/common/func_validate_configs.sh
===================================================================
--- jhalfs/branches/experimental/common/func_validate_configs.sh	2006-03-21 22:36:14 UTC (rev 2385)
+++ jhalfs/branches/experimental/common/func_validate_configs.sh	2006-03-21 23:25:40 UTC (rev 2386)
@@ -116,7 +116,7 @@
     fi
 
 
-    for config_param in FSTAB CONFIG BOOK; do
+    for config_param in FSTAB BOOK CONFIG; do
       [[ $1 = "1" ]] && echo "`eval echo $PARAM_VALS`"
       if [[ $config_param = BOOK ]]; then
          [[ ! "${WC}" = 1 ]] && continue
@@ -127,8 +127,20 @@
       # If you make it this far then there is a problem
       write_error_and_die
     done
-      echo "   ${BOLD}${GREEN}${PARAM_GROUP%%_*T} specific parameters are valid${OFF}"
+
+    [[ "$PROGNAME" = "clfs" ]] &&
+    for config_param in BOOT_CONFIG; do
+      if [[ "${METHOD}" = "boot" ]]; then
+        [[ $1 = "1" ]] && echo "`eval echo $PARAM_VALS`"
+          # There must be a config file when the build method is 'boot'
+        [[ -e "${!config_param}" ]] && [[ -s "${!config_param}" ]] && continue
+          # If you make it this far then there is a problem
+        write_error_and_die
+      fi
+    done
+    echo "   ${BOLD}${GREEN}${PARAM_GROUP%%_*T} specific parameters are valid${OFF}"
   done
+
   set -e
   echo "$tab_***${BOLD}${GREEN}Config parameters look good${OFF}***"
 }




More information about the alfs-log mailing list