r2329 - jhalfs/branches/experimental/CLFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Fri Mar 10 05:55:19 PST 2006


Author: georgeb
Date: 2006-03-10 06:55:19 -0700 (Fri, 10 Mar 2006)
New Revision: 2329

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
Log:
Moved test for the existance of  to the top of the case statement

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-03-10 01:44:55 UTC (rev 2328)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-03-10 13:55:19 UTC (rev 2329)
@@ -371,19 +371,18 @@
       *grub*)     continue     ;;
       *whatnext*) continue     ;;
       *settingenvironment*) sed 's at PS1=@set +h\nPS1=@' -i $file  ;;
-      *kernel)
-              sed "s|make mrproper|make mrproper\ncp $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
-              if [[ -n "$KEYMAP" ]]; then
-                sed "s|^loadkeys -m.*>|loadkeys -m $KEYMAP >|" -i $file
-              else
-                sed '/loadkeys -m/d'    -i $file
-                sed '/drivers\/char/d'  -i $file
-              fi
-              # if there is no kernel config file do not build the kernel
-              [[ -z $CONFIG ]] && continue
+      *kernel)   # if there is no kernel config file do not build the kernel
+                [[ -z $CONFIG ]] && continue
+                sed "s|make mrproper|make mrproper\ncp $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
+                if [[ -n "$KEYMAP" ]]; then
+                  sed "s|^loadkeys -m.*>|loadkeys -m $KEYMAP >|" -i $file
+                else
+                  sed '/loadkeys -m/d'    -i $file
+                  sed '/drivers\/char/d'  -i $file
+                fi
           ;;
     esac
     #
@@ -1017,6 +1016,8 @@
     case $this_script in
       *grub*)     continue ;;
       *kernel)
+               # if there is no kernel config file do not build the kernel
+               [[ -z $CONFIG ]] && continue
                sed "s|make mrproper|make mrproper\ncp $CONFIG .config|" -i $file
                # You cannot run menuconfig from within the makefile
                sed 's|menuconfig|oldconfig|'     -i $file
@@ -1027,8 +1028,6 @@
                  sed '/loadkeys -m/d'    -i $file
                  sed '/drivers\/char/d'  -i $file
                fi
-               # if there is no kernel config file do not build the kernel
-               [[ -z $CONFIG ]] && continue
          ;;
     esac
     #
@@ -1097,7 +1096,10 @@
     # A little housekeeping on the scripts
     case $this_script in
       *grub*)     continue  ;;
-      *kernel) cfg_file="/sources/`basename $CONFIG`"
+      *kernel) 
+               # if there is no kernel config file do not build the kernel
+               [[ -z $CONFIG ]] && continue
+               cfg_file="/sources/`basename $CONFIG`"
                sed "s|make mrproper|make mrproper\ncp $cfg_file .config|" -i $file
                # You cannot run menuconfig from within the makefile
                sed 's|menuconfig|oldconfig|'     -i $file
@@ -1108,8 +1110,6 @@
                  sed '/loadkeys -m/d'    -i $file
                  sed '/drivers\/char/d'  -i $file
                fi
-               # if there is no kernel config file do not build the kernel
-               [[ -z $CONFIG ]] && continue
          ;;
     esac
     #




More information about the alfs-log mailing list