From f4caf9cd7f297ad0938f0bdd92728a22e1bba4ad Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Mon, 11 Sep 2006 18:47:51 +0000 Subject: [PATCH] Full removed support for keymap compilation into the kernel. --- CLFS/clfs.xsl | 12 ++---------- CLFS2/clfs2.xsl | 11 ++--------- Config.in | 26 -------------------------- HLFS/hlfs.xsl | 11 ++--------- common/common-functions | 3 --- common/func_validate_configs.sh | 15 ++++----------- jhalfs | 1 - 7 files changed, 10 insertions(+), 69 deletions(-) diff --git a/CLFS/clfs.xsl b/CLFS/clfs.xsl index 377f5f1..584548d 100644 --- a/CLFS/clfs.xsl +++ b/CLFS/clfs.xsl @@ -16,9 +16,6 @@ - - - - + + make mrproper @@ -286,10 +282,6 @@ - - - **EDITME diff --git a/CLFS2/clfs2.xsl b/CLFS2/clfs2.xsl index a72ed60..75bfda4 100644 --- a/CLFS2/clfs2.xsl +++ b/CLFS2/clfs2.xsl @@ -13,9 +13,6 @@ - - - @@ -113,9 +110,8 @@ - - + + make mrproper @@ -145,9 +141,6 @@ ancestor::sect1[@id='ch-system-groff']"> - - - **EDITME diff --git a/Config.in b/Config.in index 9f873c0..809d510 100644 --- a/Config.in +++ b/Config.in @@ -236,22 +236,6 @@ menu "--- BOOK Settings" # and renamed 'bootkernel-config' # # NOTE: this setting is required - - config BOOT_KEYMAP - string "BOOT kernel keyboard map (see help)" - default "none" - depends on BUILD_BOOT - help - #-- Include the keymap in the kernel if defined. Path to the - # keymap file relative to /usr/share/kbd/keymaps/ - # (e.g., i386/qwerty/us.map.gz) or "none" if you do not want - # a keymap included in the kernel - - === Note about CLFS === - If building the SVN, Branch 1.0, or 1.0.0rc4 version using the boot method - and compiling the keymap into the kernel, you MUST manually edit the - "loadkeys" command found in $JHALFSDIR/clfs-commands/boot/066-kernel - to set the full path in your host to the keymap file. #--- End CLFS specific params #--- HLFS specific params @@ -619,16 +603,6 @@ menu "--- Build Settings" #-- Fully qualified path to a kernel config file # The config file will be copied to ${BUILD_DIR}/sources # and renamed 'kernel-config' - - config KEYMAP - string "Keyboard map" - default "none" - depends on !BOOK_LFS && CONFIG_BUILD_KERNEL - help - #-- Include the keymap in the kernel if defined. Path to the - # keymap file relative to /usr/share/kbd/keymaps/ - # (e.g., i386/qwerty/us.map.gz) or "none" if you do not want - # a keymap included in the kernel #--- End Kernel config STRIP diff --git a/HLFS/hlfs.xsl b/HLFS/hlfs.xsl index 9b45c95..dd3e09d 100644 --- a/HLFS/hlfs.xsl +++ b/HLFS/hlfs.xsl @@ -19,9 +19,6 @@ - - - - + + make mrproper @@ -319,9 +315,6 @@ - - - **EDITME diff --git a/common/common-functions b/common/common-functions index ed6600e..b00374e 100644 --- a/common/common-functions +++ b/common/common-functions @@ -532,7 +532,6 @@ extract_commands() { # --stringparam timezone $TIMEZONE \ --stringparam page $PAGE \ --stringparam lang $LANG \ - --stringparam keymap $KEYMAP \ -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 ;; @@ -544,7 +543,6 @@ extract_commands() { # --stringparam timezone $TIMEZONE \ --stringparam page $PAGE \ --stringparam lang $LANG \ - --stringparam keymap $KEYMAP \ -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 ;; hlfs) @@ -558,7 +556,6 @@ extract_commands() { # --stringparam page $PAGE \ --stringparam lang $LANG \ --stringparam lc_all $LC_ALL \ - --stringparam keymap $KEYMAP \ --stringparam grsecurity_host $GRSECURITY_HOST \ -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1 ;; diff --git a/common/func_validate_configs.sh b/common/func_validate_configs.sh index 7c944f4..4ac59ba 100644 --- a/common/func_validate_configs.sh +++ b/common/func_validate_configs.sh @@ -20,10 +20,10 @@ validate_config() { # Are the config values sane (within reason) inline_doc # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables - local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP PAGE TIMEZONE LANG LC_ALL LUSER LGROUP BLFS_TOOL" - local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TARGET32 TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL" - local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL" - local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL" + local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL PAGE TIMEZONE LANG LC_ALL LUSER LGROUP BLFS_TOOL" + local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TARGET32 TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL" + local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL" + local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL" local -r blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR" local -r blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR DEP_LIBXML DEP_LIBXSLT DEP_DBXSL DEP_LINKS DEP_SUDO DEP_WGET DEP_SVN DEP_GPM" @@ -174,13 +174,6 @@ inline_doc write_error_and_die echo ;; - KEYMAP) echo "`eval echo $PARAM_VALS`" - save_param=${KEYMAP} - [[ ! "${!config_param}" = "none" ]] && - KEYMAP="/usr/share/kbd/keymaps/${KEYMAP}" && - validate_file -z -e -s - KEYMAP=${save_param} - ;; # BLFS params. BRANCH_ID | BLFS_ROOT | BLFS_XML ) echo "`eval echo $PARAM_VALS`" ;; diff --git a/jhalfs b/jhalfs index a43241e..78043d5 100755 --- a/jhalfs +++ b/jhalfs @@ -110,7 +110,6 @@ BOMB_TEST=${BOMB_TEST:-n} STRIP=${STRIP:=n} REPORT=${REPORT:=n} VIMLANG=${VIMLANG:-n} -KEYMAP=${KEYMAP:=none} GRSECURITY_HOST=${GRSECURITY_HOST:-n} # Book surces envars