diff --git a/BLFS/gen-special.sh b/BLFS/gen-special.sh index 62bae0f..499bca4 100755 --- a/BLFS/gen-special.sh +++ b/BLFS/gen-special.sh @@ -38,8 +38,9 @@ EXCEPTIONS=$(grep 'ENTITY.*version[ ]*"[^0-9"&.].*[0-9]' ${BLFS_DIR}/packages.en sed 's@^[^"]*"\([^"]*\)".*@\1@') # Non-versioned packages: -NV_LIST="cacerts xorg-env kde-pre-install-config kf5-intro lxqt-pre-install \ -lxqt-post-install ojdk-conf tex-path" +NV_LIST="postlfs-config-profile postlfs-config-random postlfs-config-vimrc \ +xorg-env kde-pre-install-config kf5-intro \ +lxqt-pre-install lxqt-post-install ojdk-conf tex-path" # Set PATH to be sure to find udevadm SAVPATH=$PATH diff --git a/BLFS/gen_pkg_book.sh b/BLFS/gen_pkg_book.sh index 93938a1..3f8ef54 100755 --- a/BLFS/gen_pkg_book.sh +++ b/BLFS/gen_pkg_book.sh @@ -30,7 +30,10 @@ declare BLFS_XML="${TOPDIR}/blfs-xml" declare -a TARGET declare DEP_LEVEL declare SUDO +declare LANGUAGE declare WRAP_INSTALL +declare DEL_LA_FILES +declare STATS #--------------------------# parse_configuration() { # @@ -52,6 +55,7 @@ parse_configuration() { # WRAP_INSTALL=* | \ DEL_LA_FILES=* | \ STATS=* | \ + LANGUAGE=* | \ SUDO=* ) eval ${REPLY} # Define/set a global variable.. continue ;; esac @@ -79,7 +83,7 @@ parse_configuration() { # validate_configuration() { # #--------------------------# local -r dotSTR=".................." - local -r PARAM_LIST="DEP_LEVEL SUDO MAIL_SERVER WRAP_INSTALL DEL_LA_FILES STATS" + local -r PARAM_LIST="DEP_LEVEL SUDO LANGUAGE 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 @@ -211,6 +215,7 @@ xsltproc --xinclude --nonet \ --stringparam wrap-install "$WRAP_INSTALL" \ --stringparam del-la-files "$DEL_LA_FILES" \ --stringparam list-stat "$LIST_STAT" \ + --stringparam language "$LANGUAGE" \ -o ./scripts/ ${MakeScripts} \ ${BookXml} # Make the scripts executable. diff --git a/BLFS/xsl/gen_config.xsl b/BLFS/xsl/gen_config.xsl index bc326a6..cff3be9 100644 --- a/BLFS/xsl/gen_config.xsl +++ b/BLFS/xsl/gen_config.xsl @@ -55,6 +55,12 @@ config optDependency default 3 if DEPLVL_3 default 4 if DEPLVL_4 +config LANGUAGE + string "LANG variable in the form ll_CC.charmap[@modifiers]" + default "en_US.UTF-8" + help + Because of the book layout, the 3 fields, ll, CC and charmap are + mandatory. The @modfier is honoured if present. config SUDO bool "Build as User" diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl index ae1ffe5..9fdd14a 100644 --- a/BLFS/xsl/scripts.xsl +++ b/BLFS/xsl/scripts.xsl @@ -34,6 +34,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -133,12 +168,12 @@ rm -rf $PKG_DEST - + exit - + @@ -153,7 +188,7 @@ rm -rf $PKG_DEST - + @@ -208,14 +243,17 @@ cd $JH_UNPACKDIR - + sudo /sbin/ ldconfig - + @@ -455,6 +493,25 @@ fi + + + + + + + +cat > ~/.vimrc <<EOF + + + +EOF + + + + + + + @@ -464,6 +521,10 @@ fi + + + + $USER + + + + imps2 + + + /dev/input/mice + + + + + + + + + + + + + + + + + + 4 + + + + $USER ${USER}@mail.bogus + + + + + + + + 1024 + + **EDITME EDITME** + + - **EDITME - - EDITME** + diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs index 4b728af..b6fc6a8 100644 --- a/common/libs/func_install_blfs +++ b/common/libs/func_install_blfs @@ -133,8 +133,10 @@ $LINE_SUDO MAIL_SERVER=sendmail optDependency=2 SUDO=n +LANGUAGE=$LANG WRAP_INSTALL=$WRAP_INSTALL DEL_LA_FILES=$DEL_LA_FILES +STATS=n EOF # Generates the scripts for the blfs tools dependencies (in ./scripts)