Changeset dd810ea

Timestamp:

03/10/2006 11:35:41 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

aab51df

Parents:

821a2c6

Message:

Added LANG configuration option to LFS module.

Files:

• LFS/lfs.xsl (modified) (1 diff)
• LFS/master.sh (modified) (2 diffs)
• common/common-functions (modified) (10 diffs)

LFS/lfs.xsl

@@ -124 +124 @@
         <xsl:text>&#xA;</xsl:text>
       </xsl:when>
+      <!-- Setting $LANG for /et/profile -->
+      <xsl:when test="ancestor::sect1[@id='ch-scripts-profile'] and
+                contains(string(),'export LANG=')">
+        <xsl:value-of select="substring-before(string(),'export LANG=')"/>
+        <xsl:text>export LANG=$LANG</xsl:text>
+        <xsl:value-of select="substring-after(string(),'modifiers]')"/>
+        <xsl:text>&#xA;</xsl:text>
+      </xsl:when>
       <!-- Copying the kernel config file -->
       <xsl:when test="string() = 'make mrproper'">

LFS/master.sh

@@ -261 +261 @@
     fi
 
+    case "${this_script}" in
+      *profile*  ) wrt_export_lang ;; # For /etc/profile we need to set LANG envar.
+    esac
+
       # Check if we have a real /etc/fstab file
     if [[ `_IS_ ${this_script} fstab` ]] && [[ -n "$FSTAB" ]] ; then
@@ -313 +317 @@
 PAGE= $PAGE
 TIMEZONE= $TIMEZONE
+LANG= $LANG
 
 include makefile-functions

common/common-functions

@@ -1 +1 @@
 #!/bin/bash
-set +e 
+
+# $Id$
+
+set +e
 
 # VT100 colors
@@ -236 +239 @@
         echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
 
-        chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT 
+        chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
 EOF
 ) >> $MKFILE.tmp
@@ -445 +448 @@
 #----------------------------------#
   echo -e '\t@echo "export PAGE=$(PAGE)" >> envars' >> $MKFILE.tmp
+}
+
+
+#----------------------------------#
+wrt_export_lang() {            #
+#----------------------------------#
+  echo -e '\t@echo "export LANG=$(LANG)" >> envars' >> $MKFILE.tmp
 }
 
@@ -585 +595 @@
            -o patcheslist_.wget \
            patcheslist.xsl \
-           $BOOK/index.xml  
+           $BOOK/index.xml
            #> /dev/null 2>&1
 
@@ -653 +663 @@
                  --stringparam vim-lang $VIMLANG \
                  -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
+        for i in $(find ./${PROGNAME}-commands/chapter07/*) ; do
+          sed -i 's/"EOF"/EOF/g' $i ;
+        done
       ;;
     blfs)
@@ -664 +677 @@
     *) exit 1
   esac
-    
+
   echo " ...OK"
 
@@ -683 +696 @@
 
   # There is no HLFS patches.ent file so we will create one.
-  
+
   case "${PROGNAME}" in
     hlfs)  build_patches_file ;;
@@ -691 +704 @@
     *) exit 1
   esac
-  
+
   # Done. Moving on...
   get_sources
@@ -702 +715 @@
   cd $BUILDDIR/sources
 
-  # Hackish fix for the bash-doc, glibc-{linuxthreads,libidn} 
+  # Hackish fix for the bash-doc, glibc-{linuxthreads,libidn}
   # that don't conform to norms in the URL scheme.
   DIR=`echo $1 | sed 's@-doc@@;s@-linuxthreads@@;s@-libidn@@;s@-testsuite@@'`
@@ -770 +783 @@
 
       VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
-      case $PKG in 
+      case $PKG in
         tcl)         FILE="$PKG$VRS-src.tar.bz2"  ;;
         vim-lang)    PKG="vim"