r1664 - in branches/clfs-2.0/BOOK: cross-tools cross-tools/arm cross-tools/common final-preps materials/arm

jciccone at linuxfromscratch.org jciccone at linuxfromscratch.org
Fri May 26 17:16:30 PDT 2006


Author: jciccone
Date: 2006-05-26 18:16:29 -0600 (Fri, 26 May 2006)
New Revision: 1664

Modified:
   branches/clfs-2.0/BOOK/cross-tools/arm-chapter.xml
   branches/clfs-2.0/BOOK/cross-tools/arm/glibc-headers.xml
   branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml
   branches/clfs-2.0/BOOK/cross-tools/common/glibc.xml
   branches/clfs-2.0/BOOK/final-preps/creatingdirs.xml
   branches/clfs-2.0/BOOK/final-preps/creatingfiles.xml
   branches/clfs-2.0/BOOK/materials/arm/packages.xml
Log:
Added glibc-ports to arm and made a few text changes

Modified: branches/clfs-2.0/BOOK/cross-tools/arm/glibc-headers.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/arm/glibc-headers.xml	2006-05-26 20:36:55 UTC (rev 1663)
+++ branches/clfs-2.0/BOOK/cross-tools/arm/glibc-headers.xml	2006-05-27 00:16:29 UTC (rev 1664)
@@ -25,12 +25,20 @@
     <para os="s1">The following sed removes a dependency of gcc 3.4.x from
     the glibc we are using in cross-lfs. The reason we are changing it is
     because this only installs the headers, no compiling takes place. In the
-    next glibc chapter, we use the gcc that's build right after this chapter.</para>
+    next glibc chapter, we use the gcc that's built right after this chapter.</para>
  	
 <screen os="s2"><userinput>cp configure{,.orig}
 sed -e 's/3.4/3.[0-9]/g' configure.orig > configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='u1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='u2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
@@ -92,7 +100,7 @@
     we will copy the header files we need:</para>
 
    <para os="n">First we will copy a common file over to <filename 
-   class="directory">/tools/include</filename>:</para>
+   class="directory">${LFS}/usr/include</filename>:</para>
 
 <screen os="o"><userinput>install -dv ${LFS}/usr/include/bits
 cp -v bits/stdio_lim.h ${LFS}/usr/include/bits</userinput></screen>

Modified: branches/clfs-2.0/BOOK/cross-tools/arm-chapter.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/arm-chapter.xml	2006-05-26 20:36:55 UTC (rev 1663)
+++ branches/clfs-2.0/BOOK/cross-tools/arm-chapter.xml	2006-05-27 00:16:29 UTC (rev 1664)
@@ -18,7 +18,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/glibc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
 

Modified: branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml	2006-05-26 20:36:55 UTC (rev 1663)
+++ branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml	2006-05-27 00:16:29 UTC (rev 1664)
@@ -34,15 +34,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
    --host=${LFS_HOST} --target=${LFS_TARGET} --with-sysroot=${LFS} \

Modified: branches/clfs-2.0/BOOK/cross-tools/common/glibc.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/glibc.xml	2006-05-26 20:36:55 UTC (rev 1663)
+++ branches/clfs-2.0/BOOK/cross-tools/common/glibc.xml	2006-05-27 00:16:29 UTC (rev 1664)
@@ -76,10 +76,10 @@
     --with-binutils=/cross-tools/bin --with-headers=${LFS}/usr/include \
     --cache-file=config.cache</userinput></screen>
 
-    <variablelist os="dj">
+    <variablelist os="j">
       <title>The meaning of the new configure options:</title>
 
-      <varlistentry os="dj1">
+      <varlistentry os="j1">
         <term><parameter>BUILD_CC="gcc"</parameter></term>
         <listitem>
           <para>This sets Glibc to use the current compiler on our system. This is
@@ -87,7 +87,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dj2">
+      <varlistentry os="j2">
         <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the GCC compiler that we made for our target
@@ -95,7 +95,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dj3">
+      <varlistentry os="j3">
         <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the <command>ar</command> utility
@@ -103,7 +103,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dj4">
+      <varlistentry os="j4">
         <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the <command>ranlib</command> utility
@@ -111,7 +111,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dj5">
+      <varlistentry os="j5">
         <term><parameter>--disable-profile</parameter></term>
         <listitem>
           <para>This builds the libraries without profiling information. 
@@ -119,7 +119,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dj6">
+      <varlistentry os="j6">
         <term><parameter>--enable-add-ons</parameter></term>
         <listitem>
           <para>This tells Glibc to utilize all add-ons that are
@@ -127,14 +127,14 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dj7">
+      <varlistentry os="j7">
         <term><parameter>--with-tls</parameter></term>
         <listitem>
           <para>This tells Glibc to use Thread Local Storage.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dj8">
+      <varlistentry os="j8">
         <term><parameter>--with-__thread</parameter></term>
         <listitem>
           <para>This tells Glibc to use use the __thread for libc and
@@ -142,7 +142,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dj9">
+      <varlistentry os="j9">
         <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
         <listitem>
           <para>This tells Glibc to use the Binutils that are specific to
@@ -150,7 +150,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dj10">
+      <varlistentry os="j10">
         <term><parameter>--cache-file=config.cache</parameter></term>
         <listitem>
           <para>This tells Glibc to utilize a premade cache file.</para>

Modified: branches/clfs-2.0/BOOK/final-preps/creatingdirs.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-preps/creatingdirs.xml	2006-05-26 20:36:55 UTC (rev 1663)
+++ branches/clfs-2.0/BOOK/final-preps/creatingdirs.xml	2006-05-27 00:16:29 UTC (rev 1664)
@@ -15,8 +15,8 @@
 
 <screen><userinput>mkdir -pv ${LFS}/{bin,boot,etc/opt,home,lib,mnt,opt}
 mkdir -pv ${LFS}/{media/{floppy,cdrom},sbin,srv,var}
-install -dv -m 0750 /root
-install -dv -m 1777 /tmp /var/tmp
+install -dv -m 0750 ${LFS}/root
+install -dv -m 1777 ${LFS}/tmp ${LFS}/var/tmp
 mkdir -pv ${LFS}/usr/{,local/}{bin,include,lib,sbin,src}
 mkdir -pv ${LFS}/usr/{,local/}share/{doc,info,locale,man}
 mkdir -v  ${LFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}

Modified: branches/clfs-2.0/BOOK/final-preps/creatingfiles.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-preps/creatingfiles.xml	2006-05-26 20:36:55 UTC (rev 1663)
+++ branches/clfs-2.0/BOOK/final-preps/creatingfiles.xml	2006-05-27 00:16:29 UTC (rev 1664)
@@ -26,7 +26,7 @@
   <para>Create the <filename>/etc/passwd</filename> file by running the following
   command:</para>
 
-<screen><userinput>cat > %{LFS}/etc/passwd << "EOF"
+<screen><userinput>cat > ${LFS}/etc/passwd << "EOF"
 <literal>root:x:0:0:root:/root:/bin/bash</literal>
 EOF</userinput></screen>
 

Modified: branches/clfs-2.0/BOOK/materials/arm/packages.xml
===================================================================
--- branches/clfs-2.0/BOOK/materials/arm/packages.xml	2006-05-26 20:36:55 UTC (rev 1663)
+++ branches/clfs-2.0/BOOK/materials/arm/packages.xml	2006-05-27 00:16:29 UTC (rev 1664)
@@ -9,20 +9,20 @@
   <?dbhtml filename="packages-ARM.html"?>
 
   <title>Additional Packages for ARM</title>
-<!--
+
   <variablelist role="materials">
 
-    <varlistentry os="grub">
-      <term>GRUB (&grub-version;) - <token>&grub-size;</token>:</term>
+    <varlistentry>
+      <term>Glibc-ports (&glibc-ports-version;) - <token>&glibc-ports-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&grub-home;"/></para>
-        <para>Download: <ulink url="&grub-url;"/></para>
-        <para>MD5 sum: <literal>&grub-md5;</literal></para>
+        <para>Home page: <ulink url="&glibc-ports-home;"/></para>
+        <para>Download: <ulink url="&glibc-ports-url;"/></para>
+        <para>MD5 sum: <literal>&glibc-ports-md5;</literal></para>
       </listitem>
     </varlistentry>
 
   </variablelist>
--->
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>




More information about the cross-lfs mailing list