HLFS: Removed LC_ALL setting.
CLFS3: Removed remaining VIMLANG references.
This commit is contained in:
parent
f54632006b
commit
05760bc8d6
5 changed files with 5 additions and 21 deletions
|
@ -13,9 +13,6 @@
|
|||
|
||||
<!-- XSLT stylesheet to create shell scripts from CLFS2 books. -->
|
||||
|
||||
<!-- Install vim-lang package? -->
|
||||
<xsl:param name="vim-lang" select="y"/>
|
||||
|
||||
<!-- Time zone -->
|
||||
<xsl:param name="timezone" select="GMT"/>
|
||||
|
||||
|
|
|
@ -804,13 +804,6 @@ menu "--- Build Settings"
|
|||
help
|
||||
#-- Language information in /etc/profile See <locale -a> for values
|
||||
|
||||
config LC_ALL
|
||||
string "Language"
|
||||
default "$LC_ALL"
|
||||
depends on BOOK_HLFS
|
||||
help
|
||||
#-- Language information in /etc/profile See <locale -a> for values
|
||||
|
||||
#--- Groff page
|
||||
choice
|
||||
prompt "Groff page size"
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
|
||||
<!-- Locale settings -->
|
||||
<xsl:param name="lang" select="C"/>
|
||||
<xsl:param name="lc_all" select="C"/>
|
||||
|
||||
<xsl:template match="/">
|
||||
<xsl:apply-templates select="//sect1"/>
|
||||
|
@ -197,16 +196,13 @@
|
|||
<xsl:value-of select="substring-after(string(),'bzcat ')"/>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:when>
|
||||
<!-- Setting $LC_ALL and $LANG for /etc/profile -->
|
||||
<!-- Setting $LANG for /etc/profile -->
|
||||
<xsl:when test="ancestor::sect1[@id='bootable-profile'] and
|
||||
contains(string(),'export LANG=')">
|
||||
<xsl:value-of select="substring-before(string(),'export LC_ALL=')"/>
|
||||
<xsl:text>export LC_ALL=</xsl:text>
|
||||
<xsl:value-of select="$lc_all"/>
|
||||
<xsl:text>
export LANG=</xsl:text>
|
||||
<xsl:value-of select="substring-before(string(),'export LANG=')"/>
|
||||
<xsl:text>export LANG=</xsl:text>
|
||||
<xsl:value-of select="$lang"/>
|
||||
<xsl:text>
export INPUTRC</xsl:text>
|
||||
<xsl:value-of select="substring-after(string(),'INPUTRC')"/>
|
||||
<xsl:value-of select="substring-after(string(),'CC]')"/>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:when>
|
||||
<!-- Fixing bootscripts installation -->
|
||||
|
|
|
@ -111,7 +111,6 @@ extract_commands() { #
|
|||
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
|
||||
xsltproc --nonet \
|
||||
--xinclude \
|
||||
--stringparam vim-lang $VIMLANG \
|
||||
--stringparam timezone $TIMEZONE \
|
||||
--stringparam page $PAGE \
|
||||
--stringparam lang $LANG \
|
||||
|
@ -128,7 +127,6 @@ extract_commands() { #
|
|||
--stringparam timezone $TIMEZONE \
|
||||
--stringparam page $PAGE \
|
||||
--stringparam lang $LANG \
|
||||
--stringparam lc_all $LC_ALL \
|
||||
--stringparam grsecurity_host $GRSECURITY_HOST \
|
||||
-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
|
||||
;;
|
||||
|
|
|
@ -38,7 +38,7 @@ inline_doc
|
|||
|
||||
# Build Settings by book
|
||||
local -r LFS_build="$BUILD_chroot VIMLANG $BUILD_common"
|
||||
local -r HLFS_build="$BUILD_chroot $BUILD_common LC_ALL"
|
||||
local -r HLFS_build="$BUILD_chroot $BUILD_common"
|
||||
local -r CLFS_build="$BUILD_chroot VIMLANG $BUILD_common"
|
||||
local -r CLFS2_build="STRIP VIMLANG $BUILD_common"
|
||||
local -r CLFS3_build=" $BUILD_common"
|
||||
|
|
Reference in a new issue