r2392 - jhalfs/branches/experimental/CLFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Thu Mar 23 06:41:32 PST 2006


Author: georgeb
Date: 2006-03-23 07:41:31 -0700 (Thu, 23 Mar 2006)
New Revision: 2392

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
Log:
CLFS/master.sh, removed MORE kernel script manipulation- should be done via xsl

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-03-23 14:39:25 UTC (rev 2391)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-03-23 14:41:31 UTC (rev 2392)
@@ -220,16 +220,16 @@
                 [[ -z $CONFIG ]] && continue
                   # Copy the config file to /sources with a standardized name
                 cp $BOOT_CONFIG $BUILDDIR/sources/bootkernel-config
-                sed "s|make mrproper|make mrproper\ncp /sources/bootkernel-config .config|" -i $file
+#                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
+#                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 [[ -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
     #
@@ -928,22 +928,21 @@
 
     # A little housekeeping on the scripts
     case $this_script in
-      *grub*)     continue  ;;
-      *kernel)
-                 # if there is no kernel config file do not build the kernel
+      *grub*)  continue  ;;
+      *kernel) # if there is no kernel config file do not build the kernel
                [[ -z $CONFIG ]] && continue
                  # Copy the named config file to /sources with a standardized name
 	       cp $CONFIG $BUILDDIR/sources/kernel-config
-               sed "s|make mrproper|make mrproper\ncp ../kernel-config .config|" -i $file
+#               sed "s|make mrproper|make mrproper\ncp ../kernel-config .config|" -i $file
                  # You cannot run menuconfig from within the makefile
-               sed 's|menuconfig|oldconfig|'     -i $file
+#               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 [[ -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
     #




More information about the alfs-log mailing list