Changeset 492e5a3 in clfs-embedded for BOOK

Timestamp:

Nov 9, 2006, 8:19:44 PM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

faa6467

Parents:

f262bb6

Message:

Fixes for uclibc wording

Location:

BOOK/cross-tools/x86

Files:

• uclibc-headers.xml (modified) (3 diffs)
• uclibc.xml (modified) (1 diff)

BOOK/cross-tools/x86/uclibc-headers.xml

@@ -47 +47 @@
   xpointer="xpointer(//*[@os='f'])"/>
 
+<screen os="d1"><userinput>cp .config .config.orig
+sed -e "/^KERNEL_SOURCE/s:=.*:=\"${CLFS}/usr\":" \
+    -e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/lib\":" \
+    -e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
+    -e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
+    .config.orig > .config</userinput></screen>
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="uclibc.xml"
@@ -55 +62 @@
   xpointer="xpointer(//*[@os='i'])"/>
 
-   <para os="g">Create the Headers:</para>
+   <para os="d2">Create the Headers:</para>
 
-<screen os="h"><userinput>make KERNEL_SOURCE=${CLFS}/usr TARGET_ARCH=i386 headers</userinput></screen>
-
-   <para os="i">We will remove the files that were copied over from our Linux Headers, these
-   files were copied into the source directory of uClibc:</para>
+<screen os="d3"><userinput>make TARGET_ARCH=i386 headers</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -70 +74 @@
   xpointer="xpointer(//*[@os='m'])"/>
 
-<screen os="l"><userinput>cp -a include/* ${CLFS}/usr/include</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='n'])"/>
+
+<screen os="d5"><userinput>cp -a include/* ${CLFS}/usr/include</userinput></screen>
 
   </sect2>

BOOK/cross-tools/x86/uclibc.xml

@@ -74 +74 @@
 <screen os="k"><userinput>make TARGET_ARCH=i386</userinput></screen>
 
-   <para os="l">We will remove the files that were copied over from our Linux Headers, these
-   files were copied into the source directory of uClibc:</para>
+   <para os="l">We will remove the files that were copied over from our Linux Headers during
+   the building of uClibc. These files were copied into the include directory of the source
+   directory of uClibc:</para>
 
 <screen os="m"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>