r2138 - / trunk/BOOK/final-system/common trunk/BOOK/final-system/multilib trunk/BOOK/final-system/sparc trunk/BOOK/final-system/sparc64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Jul 23 12:48:38 PDT 2006


Author: jim
Date: 2006-07-23 13:48:32 -0600 (Sun, 23 Jul 2006)
New Revision: 2138

Modified:
   /
   trunk/BOOK/final-system/common/kbd.xml
   trunk/BOOK/final-system/multilib/kbd.xml
   trunk/BOOK/final-system/sparc/kbd.xml
   trunk/BOOK/final-system/sparc64/kbd.xml
Log:
 r4890 at server (orig r2259):  chris at beaker67.com | 2006-07-23 09:20:59 -0700
 Added explanation for datadir parameter in kbd instructions



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2258
   + b6734a72-470d-0410-b049-f317dca95413:/:2259

Modified: trunk/BOOK/final-system/common/kbd.xml
===================================================================
--- trunk/BOOK/final-system/common/kbd.xml	2006-07-23 19:48:18 UTC (rev 2137)
+++ trunk/BOOK/final-system/common/kbd.xml	2006-07-23 19:48:32 UTC (rev 2138)
@@ -33,22 +33,36 @@
 
 <screen os="b"><userinput>./configure --datadir=/lib/kbd</userinput></screen>
 
-    <para os="c">Compile the package:</para>
+    <variablelist os="c">
+      <title>The meaning of the configure options:</title>
 
-<screen os="d"><userinput>make</userinput></screen>
+      <varlistentry>
+        <term><parameter>--datadir</parameter></term>
+        <listitem>
+          <para>This option places the Kbd data and keymap files into /lib/kbd,
+          as they are used by some of the scripts in the CLFS-Bootscripts
+          package and must be on the root partition.</para>
+        </listitem>
+      </varlistentry>
 
-    <para os="e">This package does not come with a test suite.</para>
+    </variablelist>
 
-    <para os="f">Install the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen os="g"><userinput>make install</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="h">Some of the Programs from Kbd are used by some of the scripts
+    <para os="f">This package does not come with a test suite.</para>
+
+    <para os="g">Install the package:</para>
+
+<screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="i">Some of the programs from Kbd are used by scripts
     in the CLFS-Bootscripts package. As <filename
     class="directory">/usr</filename> may not be available during the early
     stages of booting, those binaries need to be on the root partition:</para>
 
-<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen>
+<screen os="j"><userinput>mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/kbd.xml
===================================================================
--- trunk/BOOK/final-system/multilib/kbd.xml	2006-07-23 19:48:18 UTC (rev 2137)
+++ trunk/BOOK/final-system/multilib/kbd.xml	2006-07-23 19:48:32 UTC (rev 2138)
@@ -39,12 +39,12 @@
     href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
+<screen os="e"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='f'])"/>
@@ -61,6 +61,10 @@
     href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/sparc/kbd.xml
===================================================================
--- trunk/BOOK/final-system/sparc/kbd.xml	2006-07-23 19:48:18 UTC (rev 2137)
+++ trunk/BOOK/final-system/sparc/kbd.xml	2006-07-23 19:48:32 UTC (rev 2138)
@@ -70,6 +70,10 @@
     href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/sparc64/kbd.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/kbd.xml	2006-07-23 19:48:18 UTC (rev 2137)
+++ trunk/BOOK/final-system/sparc64/kbd.xml	2006-07-23 19:48:32 UTC (rev 2138)
@@ -50,11 +50,11 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/kbd.xml"
+    href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
+    href="../multilib/kbd.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -73,6 +73,10 @@
     href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"




More information about the cross-lfs mailing list