Changeset 62033d2

Timestamp:

03/23/2006 06:51:57 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

3fcd63e

Parents:

9a4f673

Message:

Depured bootscripts and bootable chapters.

Location:

CLFS

Files:

• clfs.xsl (modified) (1 diff)
• master.sh (modified) (3 diffs)

CLFS/clfs.xsl

@@ -147 +147 @@
         <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>

CLFS/master.sh

@@ -707 +707 @@
     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\}-@@'\
@@ -785 +766 @@
     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\}-@@'\
@@ -933 +895 @@
                [[ -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