r3102 - in jhalfs/trunk: . CLFS CLFS2 HLFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Sep 11 11:47:56 PDT 2006


Author: manuel
Date: 2006-09-11 12:47:51 -0600 (Mon, 11 Sep 2006)
New Revision: 3102

Modified:
   jhalfs/trunk/CLFS/clfs.xsl
   jhalfs/trunk/CLFS2/clfs2.xsl
   jhalfs/trunk/Config.in
   jhalfs/trunk/HLFS/hlfs.xsl
   jhalfs/trunk/common/common-functions
   jhalfs/trunk/common/func_validate_configs.sh
   jhalfs/trunk/jhalfs
Log:
Full removed support for keymap compilation into the kernel.

Modified: jhalfs/trunk/CLFS/clfs.xsl
===================================================================
--- jhalfs/trunk/CLFS/clfs.xsl	2006-09-11 12:17:09 UTC (rev 3101)
+++ jhalfs/trunk/CLFS/clfs.xsl	2006-09-11 18:47:51 UTC (rev 3102)
@@ -16,9 +16,6 @@
   <!-- Build method used -->
   <xsl:param name="method" select="chroot"/>
 
-  <!-- Compile the keymap into the kernel? -->
-  <xsl:param name="keymap" select="none"/>
-
   <!-- Run test suites?
        0 = none
        1 = only Glibc, GCC and Binutils testsuites
@@ -168,9 +165,8 @@
         <xsl:value-of select="substring-after(string(),'charmap]')"/>
         <xsl:text>&#xA;</xsl:text>
       </xsl:when>
-      <!-- Compile the keymap into the kernel? -->
-      <xsl:when test="contains(string(),'defkeymap') and
-                $keymap = 'none'"/>
+      <!-- Compile the keymap into the kernel has been disabled for 1.0 -->
+      <xsl:when test="contains(string(),'defkeymap')"/>
       <!-- Copying the kernel config file -->
       <xsl:when test="string() = 'make mrproper'">
         <xsl:text>make mrproper&#xA;</xsl:text>
@@ -286,10 +282,6 @@
       <xsl:when test="ancestor::sect1[@id='ch-system-groff']">
         <xsl:value-of select="$page"/>
       </xsl:when>
-      <xsl:when test="ancestor::sect1[@id='ch-boot-kernel'] or
-                      ancestor::sect1[@id='ch-bootable-kernel']">
-        <xsl:value-of select="$keymap"/>
-      </xsl:when>
       <xsl:otherwise>
         <xsl:text>**EDITME</xsl:text>
         <xsl:apply-templates/>

Modified: jhalfs/trunk/CLFS2/clfs2.xsl
===================================================================
--- jhalfs/trunk/CLFS2/clfs2.xsl	2006-09-11 12:17:09 UTC (rev 3101)
+++ jhalfs/trunk/CLFS2/clfs2.xsl	2006-09-11 18:47:51 UTC (rev 3102)
@@ -13,9 +13,6 @@
 
 <!-- XSLT stylesheet to create shell scripts from CLFS2 books. -->
 
-  <!-- Compile the keymap into the kernel? -->
-  <xsl:param name="keymap" select="none"/>
-
   <!-- Install vim-lang package? -->
   <xsl:param name="vim-lang" select="y"/>
 
@@ -113,9 +110,8 @@
         <xsl:value-of select="substring-after(string(),'charmap]')"/>
         <xsl:text>&#xA;</xsl:text>
       </xsl:when>
-      <!-- Compile the keymap into the kernel? -->
-      <xsl:when test="contains(string(),'defkeymap') and
-                $keymap = 'none'"/>
+      <!-- Compile the keymap into the kernel has been disabled -->
+      <xsl:when test="contains(string(),'defkeymap')"/>
       <!-- Copying the kernel config file -->
       <xsl:when test="string() = 'make mrproper'">
         <xsl:text>make mrproper&#xA;</xsl:text>
@@ -145,9 +141,6 @@
                       ancestor::sect1[@id='ch-system-groff']">
         <xsl:value-of select="$page"/>
       </xsl:when>
-      <xsl:when test="ancestor::sect1[@id='ch-bootable-kernel']">
-        <xsl:value-of select="$keymap"/>
-      </xsl:when>
       <xsl:otherwise>
         <xsl:text>**EDITME</xsl:text>
         <xsl:apply-templates/>

Modified: jhalfs/trunk/Config.in
===================================================================
--- jhalfs/trunk/Config.in	2006-09-11 12:17:09 UTC (rev 3101)
+++ jhalfs/trunk/Config.in	2006-09-11 18:47:51 UTC (rev 3102)
@@ -236,22 +236,6 @@
 			#   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 @@
 			#-- 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

Modified: jhalfs/trunk/HLFS/hlfs.xsl
===================================================================
--- jhalfs/trunk/HLFS/hlfs.xsl	2006-09-11 12:17:09 UTC (rev 3101)
+++ jhalfs/trunk/HLFS/hlfs.xsl	2006-09-11 18:47:51 UTC (rev 3102)
@@ -19,9 +19,6 @@
   <!-- Is the host kernel using grsecurity? -->
   <xsl:param name="grsecurity_host" select="n"/>
 
-  <!-- Compile the keymap into the kernel? -->
-  <xsl:param name="keymap" select="none"/>
-
   <!-- Run test suites?
        0 = none
        1 = only chapter06 Glibc, GCC and Binutils testsuites
@@ -199,9 +196,8 @@
         <xsl:text>make install&#xA;</xsl:text>
         <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;&#xA;</xsl:text>
       </xsl:when>
-      <!-- Compile the keymap into the kernel? -->
-      <xsl:when test="contains(string(),'defkeymap') and
-                $keymap = 'none'"/>
+      <!-- Compile the keymap into the kernel has been dissabled -->
+      <xsl:when test="contains(string(),'defkeymap')"/>
       <!-- Copying the kernel config file -->
       <xsl:when test="string() = 'make mrproper'">
         <xsl:text>make mrproper&#xA;</xsl:text>
@@ -319,9 +315,6 @@
       <xsl:when test="ancestor::sect1[@id='ch-system-groff']">
         <xsl:value-of select="$page"/>
       </xsl:when>
-      <xsl:when test="ancestor::sect1[@id='bootable-kernel']">
-        <xsl:value-of select="$keymap"/>
-      </xsl:when>
       <xsl:otherwise>
         <xsl:text>**EDITME</xsl:text>
         <xsl:apply-templates/>

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-09-11 12:17:09 UTC (rev 3101)
+++ jhalfs/trunk/common/common-functions	2006-09-11 18:47:51 UTC (rev 3102)
@@ -532,7 +532,6 @@
                  --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 @@
                  --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 @@
                  --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
       ;;

Modified: jhalfs/trunk/common/func_validate_configs.sh
===================================================================
--- jhalfs/trunk/common/func_validate_configs.sh	2006-09-11 12:17:09 UTC (rev 3101)
+++ jhalfs/trunk/common/func_validate_configs.sh	2006-09-11 18:47:51 UTC (rev 3102)
@@ -20,10 +20,10 @@
 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 @@
                  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`" ;;

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2006-09-11 12:17:09 UTC (rev 3101)
+++ jhalfs/trunk/jhalfs	2006-09-11 18:47:51 UTC (rev 3102)
@@ -110,7 +110,6 @@
 STRIP=${STRIP:=n}
 REPORT=${REPORT:=n}
 VIMLANG=${VIMLANG:-n}
-KEYMAP=${KEYMAP:=none}
 GRSECURITY_HOST=${GRSECURITY_HOST:-n}
 
 # Book surces envars




More information about the alfs-log mailing list