r2395 - jhalfs/branches/experimental/CLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Mar 23 10:51:58 PST 2006


Author: manuel
Date: 2006-03-23 11:51:57 -0700 (Thu, 23 Mar 2006)
New Revision: 2395

Modified:
   jhalfs/branches/experimental/CLFS/clfs.xsl
   jhalfs/branches/experimental/CLFS/master.sh
Log:
Depured bootscripts and bootable chapters.

Modified: jhalfs/branches/experimental/CLFS/clfs.xsl
===================================================================
--- jhalfs/branches/experimental/CLFS/clfs.xsl	2006-03-23 18:17:47 UTC (rev 2394)
+++ jhalfs/branches/experimental/CLFS/clfs.xsl	2006-03-23 18:51:57 UTC (rev 2395)
@@ -146,7 +146,7 @@
         <xsl:value-of select="substring-before(string(),'export LANG=')"/>
         <xsl:text>export LANG=</xsl:text>
         <xsl:value-of select="$lang"/>
-        <xsl:value-of select="substring-after(string(),'modifiers]')"/>
+        <xsl:value-of select="substring-after(string(),'charmap]')"/>
         <xsl:text>&#xA;</xsl:text>
       </xsl:when>
       <!-- Compile the keymap into the kernel? -->

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-03-23 18:17:47 UTC (rev 2394)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-03-23 18:51:57 UTC (rev 2395)
@@ -706,25 +706,6 @@
     # the names of the targets in the Makefile
     bootscripttools="$bootscripttools $this_script"
 
-    # A little bit of script modification
-    case $this_script_BLOCKED in
-      *profile*)  # Over-ride the book cmds, write our own simple one.
-(
-cat <<- EOF
-	cat > /etc/profile << "_EOF_"
-	# Begin /etc/profile
-
-	export LC_ALL=${LC_ALL}
-	export LANG=${LANG}
-	export INPUTRC=/etc/inputrc
-
-	# End /etc/profile
-	_EOF_
-EOF
-) > $file
-           ;;
-    esac
-
     # Grab the name of the target, strip id number, XXX-script
     name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'\
                                   -e 's at -64bit@@' \
@@ -784,25 +765,6 @@
     # the names of the targets in the Makefile
     bootscripttools="$bootscripttools $this_script"
 
-    # A little bit of script modification
-    case $this_script_BLOCKED in
-      *profile*)  # Over-ride the book cmds, write our own simple one.
-(
-cat <<- EOF
-	cat > /etc/profile << "_EOF_"
-	# Begin /etc/profile
-
-	export LC_ALL=${LC_ALL}
-	export LANG=${LANG}
-	export INPUTRC=/etc/inputrc
-
-	# End /etc/profile
-	_EOF_
-EOF
-) > $file
-           ;;
-    esac
-
     # Grab the name of the target, strip id number, XXX-script
     name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'\
                                   -e 's at -64bit@@' \
@@ -932,17 +894,7 @@
       *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
-                 # 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
+               cp $CONFIG $BUILDDIR/sources/kernel-config
          ;;
     esac
     #




More information about the alfs-log mailing list