r2137 - / branches/clfs-2.0/BOOK/bootable/arm branches/clfs-2.0/BOOK/bootable/x86 branches/clfs-2.0/BOOK/prologue/common

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


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

Modified:
   /
   branches/clfs-2.0/BOOK/bootable/arm/kernel.xml
   branches/clfs-2.0/BOOK/bootable/x86/kernel.xml
   branches/clfs-2.0/BOOK/prologue/common/prerequisites.xml
Log:
 r4889 at server (orig r2258):  jciccone | 2006-07-23 09:14:05 -0700
 Update the kernel commands to the proper arch and changed the path to the keymaps, and a text update.



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

Modified: branches/clfs-2.0/BOOK/bootable/arm/kernel.xml
===================================================================
--- branches/clfs-2.0/BOOK/bootable/arm/kernel.xml	2006-07-23 19:47:59 UTC (rev 2136)
+++ branches/clfs-2.0/BOOK/bootable/arm/kernel.xml	2006-07-23 19:48:18 UTC (rev 2137)
@@ -40,11 +40,11 @@
     decided to compile the keymap into the kernel, issue the command
     below:</para>
 
-<screen os="f"><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
+<screen os="f"><userinput>loadkeys -m ${CLFS}/lib/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
     drivers/char/defkeymap.c</userinput></screen>
 
     <para os="g">For example, if using a Dutch keyboard, use
-    <filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
+    <filename>${CLFS}/lib/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
 
     <para os="h">Configure the kernel via a menu-driven interface.
     Please note that the udev bootscript requires "rtc" and "tmpfs" to be

Modified: branches/clfs-2.0/BOOK/bootable/x86/kernel.xml
===================================================================
--- branches/clfs-2.0/BOOK/bootable/x86/kernel.xml	2006-07-23 19:47:59 UTC (rev 2136)
+++ branches/clfs-2.0/BOOK/bootable/x86/kernel.xml	2006-07-23 19:48:18 UTC (rev 2137)
@@ -69,9 +69,7 @@
     href="../arm/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../arm/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
+<screen os="n"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../arm/kernel.xml"
@@ -93,9 +91,8 @@
     href="../arm/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../arm/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
+<screen os="t"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
+    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../arm/kernel.xml"
@@ -105,7 +102,7 @@
     href="../arm/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../arm/kernel.xml"

Modified: branches/clfs-2.0/BOOK/prologue/common/prerequisites.xml
===================================================================
--- branches/clfs-2.0/BOOK/prologue/common/prerequisites.xml	2006-07-23 19:47:59 UTC (rev 2136)
+++ branches/clfs-2.0/BOOK/prologue/common/prerequisites.xml	2006-07-23 19:48:18 UTC (rev 2137)
@@ -48,7 +48,7 @@
       <para remap="verbatim">The Essential Pre-Reading Hint
       <ulink url="&hints-root;essential_prereading.txt"/></para>
 
-      <para>This is an hint written specifically for users new to Linux.
+      <para>This is a hint written specifically for users new to Linux.
       It includes a list of links to excellent sources of information on a
       wide range of topics. Anyone attempting to install CLFS should have an
       understanding of many of the topics in this hint.</para>




More information about the cross-lfs mailing list