Process layout replaceable
This commit is contained in:
parent
0a0b60984c
commit
30732c6a16
3 changed files with 19 additions and 1 deletions
|
@ -31,6 +31,7 @@ declare -a TARGET
|
|||
declare DEP_LEVEL
|
||||
declare SUDO
|
||||
declare LANGUAGE
|
||||
declare KBLAYOUT
|
||||
declare WRAP_INSTALL
|
||||
declare DEL_LA_FILES
|
||||
declare STATS
|
||||
|
@ -56,6 +57,7 @@ parse_configuration() { #
|
|||
DEL_LA_FILES=* | \
|
||||
STATS=* | \
|
||||
LANGUAGE=* | \
|
||||
KBLAYOUT=* | \
|
||||
SUDO=* ) eval ${REPLY} # Define/set a global variable..
|
||||
continue ;;
|
||||
esac
|
||||
|
@ -83,7 +85,7 @@ parse_configuration() { #
|
|||
validate_configuration() { #
|
||||
#--------------------------#
|
||||
local -r dotSTR=".................."
|
||||
local -r PARAM_LIST="DEP_LEVEL SUDO LANGUAGE MAIL_SERVER WRAP_INSTALL DEL_LA_FILES STATS"
|
||||
local -r PARAM_LIST="DEP_LEVEL SUDO LANGUAGE KBLAYOUT MAIL_SERVER WRAP_INSTALL DEL_LA_FILES STATS"
|
||||
local -r PARAM_VALS='${config_param}${dotSTR:${#config_param}} ${L_arrow}${BOLD}${!config_param}${OFF}${R_arrow}'
|
||||
local config_param
|
||||
local -i index
|
||||
|
@ -216,6 +218,7 @@ xsltproc --xinclude --nonet \
|
|||
--stringparam del-la-files "$DEL_LA_FILES" \
|
||||
--stringparam list-stat "$LIST_STAT" \
|
||||
--stringparam language "$LANGUAGE" \
|
||||
--stringparam xkblayout "$KBLAYOUT" \
|
||||
--stringparam fqdn "$(hostname -f)" \
|
||||
-o ./scripts/ ${MakeScripts} \
|
||||
${BookXml}
|
||||
|
|
|
@ -62,6 +62,13 @@ config LANGUAGE
|
|||
Because of the book layout, the 3 fields, ll, CC and charmap are
|
||||
mandatory. The @modfier is honoured if present.
|
||||
|
||||
config KBLAYOUT
|
||||
string "Keyboard layout (to be used in GDM)"
|
||||
default "us"
|
||||
help
|
||||
Used in GDM for setting the login screen keyboard layout.
|
||||
See the GDM page in the book for what to put into this field
|
||||
|
||||
config SUDO
|
||||
bool "Build as User"
|
||||
default y
|
||||
|
|
|
@ -53,6 +53,10 @@
|
|||
'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
|
||||
<!-- end of host/domain name variables -->
|
||||
|
||||
<!--===================================================================-->
|
||||
<!-- keyboard layout for the gdm page (as of BLFS 9.0) -->
|
||||
<xsl:param name="xkblayout" select="'us'"/>
|
||||
|
||||
<!--===================================================================-->
|
||||
<!-- the main template: to be adjusted depending on the book -->
|
||||
<xsl:template match="replaceable">
|
||||
|
@ -85,6 +89,10 @@
|
|||
<xsl:when test="contains(string(),'@modifier')">
|
||||
<xsl:copy-of select="$lang-modifier"/>
|
||||
</xsl:when>
|
||||
<!-- keyboard layout for X/waylang (only GDM as of BLFS-9.0) -->
|
||||
<xsl:when test="contains(string(),'layout')">
|
||||
<xsl:copy-of select="$xkblayout"/>
|
||||
</xsl:when>
|
||||
<!-- At several places, the number of jobs is given as "N" in a replaceable
|
||||
tag. We either detect "N" alone or <N> Replace N with 4. -->
|
||||
<xsl:when test="contains(string(),'<N>') or string()='N'">
|
||||
|
|
Reference in a new issue