r6786 - in branches/cross-lfs/BOOK: . boot boot/64 boot/common boot/mips64 boot/multilib boot/sparc boot/sparc64 cross-tools/alpha cross-tools/mips cross-tools/mips64 cross-tools/mips64-64 cross-tools/ppc cross-tools/sparc cross-tools/sparc64 cross-tools/sparc64-64 cross-tools/x86 cross-tools/x86_64 final-system final-system/64 final-system/alpha final-system/common final-system/mips final-system/mips64 final-system/mips64-64 final-system/multilib final-system/ppc final-system/sparc final-system/sparc64 final-system/sparc64-64 final-system/x86 final-system/x86_64 final-system/x86_64-64 introduction introduction/alpha introduction/common introduction/mips introduction/mips64 introduction/mips64-64 introduction/ppc introduction/sparc introduction/sparc64 introduction/sparc64-64 introduction/x86 introduction/x86_64 introduction/x86_64-64 materials/alpha materials/common materials/mips materials/mips64 materials/mips64-64 materials/ppc materials/sparc materials/sparc64 materials/sparc64-64 materials/x86 materials/x86_64 materials/x86_64-64 temp-system/alpha temp-system/mips temp-system/mips64 temp-system/mips64-64 temp-system/ppc temp-system/sparc temp-system/sparc64 temp-system/sparc64-64 temp-system/x86 temp-system/x86_64 temp-system/x86_64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Aug 31 12:43:34 PDT 2005


Author: jim
Date: 2005-08-31 13:43:14 -0600 (Wed, 31 Aug 2005)
New Revision: 6786

Added:
   branches/cross-lfs/BOOK/introduction/mips64-64-chapter.xml
   branches/cross-lfs/BOOK/introduction/mips64-64/
   branches/cross-lfs/BOOK/introduction/mips64-64/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/sparc64-64-chapter.xml
   branches/cross-lfs/BOOK/introduction/sparc64-64/
   branches/cross-lfs/BOOK/introduction/sparc64-64/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/x86_64-64-chapter.xml
   branches/cross-lfs/BOOK/introduction/x86_64-64/
   branches/cross-lfs/BOOK/introduction/x86_64-64/whatsnew.xml
Removed:
   branches/cross-lfs/BOOK/boot/sparc/netkit_base.xml
   branches/cross-lfs/BOOK/boot/sparc64/netkit_base.xml
   branches/cross-lfs/BOOK/final-system/sparc/netkit_base.xml
   branches/cross-lfs/BOOK/final-system/sparc64/netkit_base.xml
Modified:
   branches/cross-lfs/BOOK/
   branches/cross-lfs/BOOK/boot/64/inetutils.xml
   branches/cross-lfs/BOOK/boot/64/util-linux.xml
   branches/cross-lfs/BOOK/boot/common/inetutils.xml
   branches/cross-lfs/BOOK/boot/common/util-linux.xml
   branches/cross-lfs/BOOK/boot/mips64/util-linux.xml
   branches/cross-lfs/BOOK/boot/multilib/inetutils.xml
   branches/cross-lfs/BOOK/boot/multilib/util-linux.xml
   branches/cross-lfs/BOOK/boot/sparc-chapter.xml
   branches/cross-lfs/BOOK/boot/sparc64-64-chapter.xml
   branches/cross-lfs/BOOK/boot/sparc64-chapter.xml
   branches/cross-lfs/BOOK/cross-tools/alpha/glibc-headers.xml
   branches/cross-lfs/BOOK/cross-tools/alpha/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/mips64-64/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml
   branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml
   branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/ppc/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/sparc/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64-64/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64/glibc-64bit.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-64bit.xml
   branches/cross-lfs/BOOK/cross-tools/x86_64/glibc.xml
   branches/cross-lfs/BOOK/final-system/64/gcc.xml
   branches/cross-lfs/BOOK/final-system/alpha/glibc.xml
   branches/cross-lfs/BOOK/final-system/alpha/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/common/gcc.xml
   branches/cross-lfs/BOOK/final-system/common/inetutils.xml
   branches/cross-lfs/BOOK/final-system/common/kbd.xml
   branches/cross-lfs/BOOK/final-system/common/util-linux.xml
   branches/cross-lfs/BOOK/final-system/mips/glibc.xml
   branches/cross-lfs/BOOK/final-system/mips/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/mips64-64/glibc.xml
   branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml
   branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml
   branches/cross-lfs/BOOK/final-system/mips64/glibc.xml
   branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml
   branches/cross-lfs/BOOK/final-system/multilib/gcc.xml
   branches/cross-lfs/BOOK/final-system/multilib/inetutils.xml
   branches/cross-lfs/BOOK/final-system/multilib/kbd.xml
   branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml
   branches/cross-lfs/BOOK/final-system/ppc/glibc.xml
   branches/cross-lfs/BOOK/final-system/ppc/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/sparc-chapter.xml
   branches/cross-lfs/BOOK/final-system/sparc/glibc.xml
   branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/sparc64-64-chapter.xml
   branches/cross-lfs/BOOK/final-system/sparc64-64/glibc.xml
   branches/cross-lfs/BOOK/final-system/sparc64-64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/sparc64-chapter.xml
   branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml
   branches/cross-lfs/BOOK/final-system/sparc64/glibc.xml
   branches/cross-lfs/BOOK/final-system/sparc64/kbd.xml
   branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/x86/glibc.xml
   branches/cross-lfs/BOOK/final-system/x86/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml
   branches/cross-lfs/BOOK/final-system/x86_64-64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml
   branches/cross-lfs/BOOK/final-system/x86_64/glibc.xml
   branches/cross-lfs/BOOK/final-system/x86_64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/general.ent
   branches/cross-lfs/BOOK/introduction/alpha/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/common/changelog.xml
   branches/cross-lfs/BOOK/introduction/common/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/mips/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/mips64/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/ppc/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/sparc/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/sparc64/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/x86/whatsnew.xml
   branches/cross-lfs/BOOK/introduction/x86_64/whatsnew.xml
   branches/cross-lfs/BOOK/materials/alpha/patches.xml
   branches/cross-lfs/BOOK/materials/common/packages.xml
   branches/cross-lfs/BOOK/materials/common/patches.xml
   branches/cross-lfs/BOOK/materials/mips/patches.xml
   branches/cross-lfs/BOOK/materials/mips64-64/patches.xml
   branches/cross-lfs/BOOK/materials/mips64/patches.xml
   branches/cross-lfs/BOOK/materials/ppc/patches.xml
   branches/cross-lfs/BOOK/materials/sparc/packages.xml
   branches/cross-lfs/BOOK/materials/sparc/patches.xml
   branches/cross-lfs/BOOK/materials/sparc64-64/packages.xml
   branches/cross-lfs/BOOK/materials/sparc64-64/patches.xml
   branches/cross-lfs/BOOK/materials/sparc64/packages.xml
   branches/cross-lfs/BOOK/materials/sparc64/patches.xml
   branches/cross-lfs/BOOK/materials/x86/patches.xml
   branches/cross-lfs/BOOK/materials/x86_64-64/patches.xml
   branches/cross-lfs/BOOK/materials/x86_64/patches.xml
   branches/cross-lfs/BOOK/mips64-64-index.xml
   branches/cross-lfs/BOOK/patches.ent
   branches/cross-lfs/BOOK/sparc64-64-index.xml
   branches/cross-lfs/BOOK/temp-system/alpha/gcc.xml
   branches/cross-lfs/BOOK/temp-system/mips/gcc.xml
   branches/cross-lfs/BOOK/temp-system/mips64-64/gcc.xml
   branches/cross-lfs/BOOK/temp-system/mips64/gcc.xml
   branches/cross-lfs/BOOK/temp-system/ppc/gcc.xml
   branches/cross-lfs/BOOK/temp-system/sparc/gcc.xml
   branches/cross-lfs/BOOK/temp-system/sparc64-64/gcc.xml
   branches/cross-lfs/BOOK/temp-system/sparc64/gcc.xml
   branches/cross-lfs/BOOK/temp-system/x86/gcc.xml
   branches/cross-lfs/BOOK/temp-system/x86_64-64/gcc.xml
   branches/cross-lfs/BOOK/temp-system/x86_64/gcc.xml
   branches/cross-lfs/BOOK/x86_64-64-index.xml
Log:
 r7316 at server:  jim | 2005-08-31 12:41:31 -0700
 GCC 4.x Updates
 Linux 2.6.12.6
 Typos in Alpha
 Removal of netkit_base from Sparc builds
 
 



Property changes on: branches/cross-lfs/BOOK
___________________________________________________________________
Name: svk:merge
   - 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7307
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
   + 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7316
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516

Modified: branches/cross-lfs/BOOK/boot/64/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/64/inetutils.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/64/inetutils.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -53,6 +53,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" \

Modified: branches/cross-lfs/BOOK/boot/64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/64/util-linux.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/64/util-linux.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -53,6 +53,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/boot/common/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/inetutils.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/common/inetutils.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -53,6 +53,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/inetutils.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
@@ -67,7 +75,7 @@
     href="../../final-system/common/inetutils.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="aa"><userinput>make LDFLAGS="-s"</userinput></screen>
+<screen os="aa"><userinput>make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"

Modified: branches/cross-lfs/BOOK/boot/common/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/util-linux.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/common/util-linux.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -51,6 +51,14 @@
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
     <para os="ba">Util-linux does not use the freshly installed headers and
     libraries from the <filename class="directory">/tools</filename>
     directory by default. This is fixed by altering the configure script:</para>

Modified: branches/cross-lfs/BOOK/boot/mips64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/util-linux.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/mips64/util-linux.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -52,6 +52,14 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips64/util-linux.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 

Modified: branches/cross-lfs/BOOK/boot/multilib/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/inetutils.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/multilib/inetutils.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -53,6 +53,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" \

Modified: branches/cross-lfs/BOOK/boot/multilib/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/util-linux.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/multilib/util-linux.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -53,6 +53,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Deleted: branches/cross-lfs/BOOK/boot/sparc/netkit_base.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc/netkit_base.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/sparc/netkit_base.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
-  %general-entities;
-  %patches-entities;
-]>
-
-<sect1 id="ch-boot-netkit_base" role="wrap">
-  <?dbhtml filename="netkit_base.html"?>
-
-  <title>Netkit base-&netkit_base-version;</title>
-
-  <indexterm zone="ch-boot-netkit_base">
-    <primary sortas="a-Netkit base">Netkit base</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Netkit base</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>./configure --prefix=/tools </userinput></screen>
-
-   <para os="aa">Now we make the build compatible with our build. We change
-   the user to 0. Remove the <option>-s</option> from the installation commands.
-   Remove the <envar>CC</envar> and <envar>CFLAGS</envar> variable from the
-   <filename>Makefile</filename>. This will allow us to cross-compile with no
-   issues at all.</para>
-
-<screen os="ab"><userinput>sed -i '/CC=/d' MCONFIG
-sed -i '/CFLAGS=/d' MCONFIG
-sed -i 's/install -s/install/g' inetd/Makefile
-sed -i 's/install -s/install/g' ping/Makefile
-sed -i 's/-o root//g' inetd/Makefile
-sed -i 's/-o root//g' ping/Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen><userinput>make CC="${CC}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-netkit_base" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: branches/cross-lfs/BOOK/boot/sparc-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc-chapter.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/sparc-chapter.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -15,7 +15,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/netkit_base.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>

Deleted: branches/cross-lfs/BOOK/boot/sparc64/netkit_base.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64/netkit_base.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/sparc64/netkit_base.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
-  %general-entities;
-  %patches-entities;
-]>
-
-<sect1 id="ch-boot-netkit_base" role="wrap">
-  <?dbhtml filename="netkit_base.html"?>
-
-  <title>Netkit base-&netkit_base-version;</title>
-
-  <indexterm zone="ch-boot-netkit_base">
-    <primary sortas="a-Netkit base">Netkit base</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Netkit base</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>./configure --prefix=/tools </userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen><userinput>make CC="${CC} ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-netkit_base" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: branches/cross-lfs/BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64-64-chapter.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/sparc64-64-chapter.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -15,7 +15,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/netkit_base.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>

Modified: branches/cross-lfs/BOOK/boot/sparc64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64-chapter.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/boot/sparc64-chapter.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -15,7 +15,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/netkit_base.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>

Modified: branches/cross-lfs/BOOK/cross-tools/alpha/glibc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/alpha/glibc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/alpha/glibc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -105,7 +105,7 @@
     href="../x86/glibc-headers.xml"
     xpointer="xpointer(//*[@os='cl'])"/>
 
-<screen><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
+<screen><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/cross-tools/alpha/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/alpha/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/alpha/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -67,6 +67,26 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -76,6 +76,26 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -76,6 +76,26 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -76,6 +76,26 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -76,6 +76,26 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips64/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/mips64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64-64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/mips64-64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -76,6 +76,26 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips64-64/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/ppc/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/ppc/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/ppc/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -56,6 +56,26 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/sparc/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/sparc/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -67,7 +67,31 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='d6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64/glibc-64bit.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64/glibc-64bit.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -68,6 +68,30 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='d6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -68,6 +68,30 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='d6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc64/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64-64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64-64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -68,6 +68,30 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='d6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc64-64/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -54,6 +54,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-64bit.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-64bit.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -57,6 +57,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/cross-tools/x86_64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86_64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/cross-tools/x86_64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -56,6 +56,26 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/64/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/64/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -46,14 +46,6 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
     <para>Apply the following patch to so that linking to /lib64 is now set
     to /lib.</para>
 

Modified: branches/cross-lfs/BOOK/final-system/alpha/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/alpha/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/alpha/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -68,6 +68,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/alpha/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/alpha/linux-libc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/alpha/linux-libc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -51,7 +51,10 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>cp -R include/asm-alpha /usr/include/asm
-cp -R include/linux /usr/include</userinput></screen>
+cp -R include/linux /usr/include
+cp -R include/mtd /usr/include
+cp -R include/sound /usr/include
+cp -R include/scsi /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"

Modified: branches/cross-lfs/BOOK/final-system/common/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/common/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -53,12 +53,6 @@
     as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
     unset them when building GCC.</para>
 
-    <para os="b">GCC fails to compile some packages outside of a base Linux From Scratch
-    install (e.g., Mozilla and kdegraphics) when used in conjunction with newer
-    versions of Binutils. Apply the following patch to fix this issue:</para>
-
-<screen os="c"><userinput>patch -Np1 -i ../&gcc-linkonce-patch;</userinput></screen>
-
     <para os="d">Apply a <command>sed</command> substitution that will suppress the
     installation of <filename class="libraryfile">libiberty.a</filename>. The
     version of <filename class="libraryfile">libiberty.a</filename> provided by

Modified: branches/cross-lfs/BOOK/final-system/common/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/inetutils.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/common/inetutils.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -52,6 +52,10 @@
 
 <screen os="b"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
 
+    <para os="b1">The following patches addresses build issues with GCC 4.x:</para>
+
+<screen os="b2"><userinput>patch -Np1 -i ../&inetutils-gcc4_fixes-patch;</userinput></screen>
+
     <para os="c">Prepare Inetutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \

Modified: branches/cross-lfs/BOOK/final-system/common/kbd.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/kbd.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/common/kbd.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -46,6 +46,10 @@
   <sect2 role="installation">
     <title>Installation of Kbd</title>
 
+    <para os="a1">The following patch fixes build issues with GCC 4.x:</para>
+
+<screen os="a2"><userinput>patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen>
+
     <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/common/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/util-linux.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/common/util-linux.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -67,6 +67,10 @@
 
 <screen os="b"><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
 
+    <para os="b1">The following patches fixes build issues with GCC 4.x:</para>
+
+<screen os="b2"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
+
     <para os="c">Prepare Util-linux for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/mips/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/mips/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -74,6 +74,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/mips/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips/linux-libc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/mips/linux-libc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -51,7 +51,10 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>cp -R include/asm-mips /usr/include/asm
-cp -R include/linux /usr/include</userinput></screen>
+cp -R include/linux /usr/include
+cp -R include/mtd /usr/include
+cp -R include/sound /usr/include
+cp -R include/scsi /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"

Modified: branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -75,6 +75,26 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -72,6 +72,26 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/mips64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/mips64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -73,6 +73,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -52,6 +52,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <para os="aa">Util-linux has a compilation error when built using 64bit

Modified: branches/cross-lfs/BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64-64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/mips64-64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -75,6 +75,26 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips64/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/multilib/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -48,14 +48,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/multilib/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/inetutils.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/multilib/inetutils.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -52,6 +52,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libexecdir=/usr/sbin \

Modified: branches/cross-lfs/BOOK/final-system/multilib/kbd.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/kbd.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/multilib/kbd.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -42,6 +42,14 @@
   <sect2 role="installation">
     <title>Installation of Kbd</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
+
     <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -56,6 +56,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/ppc/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/ppc/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/ppc/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,6 +60,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/ppc/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/ppc/linux-libc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/ppc/linux-libc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -51,7 +51,10 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>cp -R include/asm-ppc /usr/include/asm
-cp -R include/linux /usr/include</userinput></screen>
+cp -R include/linux /usr/include
+cp -R include/mtd /usr/include
+cp -R include/sound /usr/include
+cp -R include/scsi /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"

Modified: branches/cross-lfs/BOOK/final-system/sparc/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -68,6 +68,28 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+<screen os="d6"><userinput>patch -Np1 -i ../&glibc-sparc_gcc4_fixes-patch;</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -51,7 +51,10 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>cp -R include/asm-sparc /usr/include/asm
-cp -R include/linux /usr/include</userinput></screen>
+cp -R include/linux /usr/include
+cp -R include/mtd /usr/include
+cp -R include/sound /usr/include
+cp -R include/scsi /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"

Deleted: branches/cross-lfs/BOOK/final-system/sparc/netkit_base.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/netkit_base.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc/netkit_base.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
-  %general-entities;
-  %patches-entities;
-]>
-
-<sect1 id="ch-system-netkit_base" role="wrap">
-  <?dbhtml filename="netkit_base.html"?>
-
-  <title>Netkit Base-&netkit_base-version;</title>
-
-  <indexterm zone="ch-system-netkit_base">
-    <primary sortas="a-Netkit Base">Netkit Base</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The NetKit Base package contains programs for basic networking.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Netkit Base</title>
-
-   <para os="a">Prepare Netkit base for compilation:</para>
-
-<screen><userinput>./configure</userinput></screen>
-
-   <para os="b">Remove the <envar>CC</envar> and C<envar>FLAGS</envar> variables
-   to avoid any compile issues.</para>
-
-<screen os="c"><userinput>sed -i '/CC=/d' MCONFIG
-sed -i '/CFLAGS=/d' MCONFIG</userinput></screen>
-
-    <para os="d">Netkit Base needs patching to be compatable with the
-    current toolchains. This patch will correct that situation:</para>
-
-<screen os="e"><userinput>patch -Np1 -i ../&netkit_base-fixes-patch;</userinput></screen>
-
-    <para os="f">Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-netkit_base" role="content">
-    <title>Contents of Netkit base</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>inetd and ping</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ping">
-        <term><command>ping</command></term>
-        <listitem>
-          <para>Sends echo-request packets and reports how long the replies
-          take</para>
-          <indexterm zone="ch-system-netkit_base ping">
-            <primary sortas="b-ping">ping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="inetd">
-        <term><command>inetd</command></term>
-        <listitem>
-          <para>Allows running one daemon to invoke several others,
-           reducing load on the system.</para>
-          <indexterm zone="ch-system-netkit_base inetd">
-            <primary sortas="b-inetd">inetd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>

Modified: branches/cross-lfs/BOOK/final-system/sparc-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc-chapter.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc-chapter.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -31,7 +31,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/netkit_base.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>

Modified: branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -67,6 +67,30 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='d6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -65,6 +65,30 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='d6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/sparc64/kbd.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/kbd.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc64/kbd.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -43,6 +43,14 @@
     <title>Installation of Kbd</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/kbd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -59,20 +59,23 @@
 cp -R include/asm-sparc64 /usr/include/
 cp -R include/asm-sparc /usr/include/
 cp -R include/asm-sparc-biarch /usr/include/asm
-cp -R include/linux /usr/include</userinput></screen>
+cp -R include/linux /usr/include
+cp -R include/mtd /usr/include
+cp -R include/sound /usr/include
+cp -R include/scsi /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>chown -R root:root /usr/include/{asm,asm-sparc,asm-sparc64,linux}</userinput></screen>
+<screen><userinput>chown -R root:root /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,sound,scsi}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>find /usr/include/{asm,asm-sparc,asm-sparc64,linux} -type d -exec chmod 755 {} \;
-find /usr/include/{asm,asm-sparc,asm-sparc64,linux} -type f -exec chmod 644 {} \;</userinput></screen>
+<screen><userinput>find /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,sound,scsi} -type d -exec chmod 755 {} \;
+find /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,sound,scsi} -type f -exec chmod 644 {} \;</userinput></screen>
 
   </sect2>
 

Deleted: branches/cross-lfs/BOOK/final-system/sparc64/netkit_base.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/netkit_base.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc64/netkit_base.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
-  %general-entities;
-  %patches-entities;
-]>
-
-<sect1 id="ch-system-netkit_base" role="wrap">
-  <?dbhtml filename="netkit_base.html"?>
-
-  <title>Netkit Base-&netkit_base-version;</title>
-
-  <indexterm zone="ch-system-netkit_base">
-    <primary sortas="a-Netkit Base">Netkit Base</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Netkit Base</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>./configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/netkit_base.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/netkit_base.xml"
-  xpointer="xpointer(id('contents-netkit_base'))"/>
-
-</sect1>

Modified: branches/cross-lfs/BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64-64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc64-64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -67,6 +67,30 @@
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='d6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc64/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc64-64/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64-64/linux-libc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc64-64/linux-libc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -52,7 +52,10 @@
 
 <screen><userinput>install -d /usr/include
 cp -R include/asm-sparc64 /usr/include/asm
-cp -R include/linux /usr/include</userinput></screen>
+cp -R include/linux /usr/include
+cp -R include/mtd /usr/include
+cp -R include/sound /usr/include
+cp -R include/scsi /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"

Modified: branches/cross-lfs/BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64-64-chapter.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc64-64-chapter.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -31,7 +31,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/netkit_base.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>

Modified: branches/cross-lfs/BOOK/final-system/sparc64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64-chapter.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/sparc64-chapter.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -37,7 +37,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/netkit_base.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>

Modified: branches/cross-lfs/BOOK/final-system/x86/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/x86/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -78,6 +78,16 @@
 
 <screen os="d"><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
 
+    <para os="d1">The following patches fix build issues that are caused by GCC 4.x:</para>
+
+<screen os="d2"><userinput>patch -Np1 -i ../&glibc-gcc4-fix_elf-patch;</userinput></screen>
+
+<screen os="d3"><userinput>patch -Np1 -i ../&glibc-gcc4_fix_iconvdata-patch;</userinput></screen>
+
+<screen os="d4"><userinput>patch -Np1 -i ../&glibc-gcc4_fix_string-patch;</userinput></screen>
+
+<screen os="d5"><userinput>patch -Np1 -i ../&glibc-gcc4_fix_symbols-patch;</userinput></screen>
+
     <para os="e">The Glibc documentation recommends building Glibc outside of the
     source directory in a dedicated build directory:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/x86/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86/linux-libc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/x86/linux-libc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -56,17 +56,20 @@
     <para os="b">Install the header files:</para>
 
 <screen><userinput>cp -R include/asm-i386 /usr/include/asm
-cp -R include/linux /usr/include</userinput></screen>
+cp -R include/linux /usr/include
+cp -R include/mtd /usr/include
+cp -R include/sound /usr/include
+cp -R include/scsi /usr/include</userinput></screen>
 
     <para os="c">Ensure that all the headers are owned by
     <systemitem class="username">root</systemitem>:</para>
 
-<screen os="d"><userinput>chown -R root:root /usr/include/{asm,linux}</userinput></screen>
+<screen os="d"><userinput>chown -R root:root /usr/include/{asm,linux,mtd,sound,scsi}</userinput></screen>
 
     <para os="e">Make sure the users can read the headers:</para>
 
-<screen os="f"><userinput>find /usr/include/{asm,linux} -type d -exec chmod 755 {} \;
-find /usr/include/{asm,linux} -type f -exec chmod 644 {} \;</userinput></screen>
+<screen os="f"><userinput>find /usr/include/{asm,linux,mtd,sound,scsi} -type d -exec chmod 755 {} \;
+find /usr/include/{asm,linux,mtd,sound,scsi} -type f -exec chmod 644 {} \;</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -63,6 +63,26 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/x86_64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/x86_64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -61,6 +61,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/x86_64/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64/linux-libc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/x86_64/linux-libc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -59,20 +59,23 @@
 cp -R include/asm-i386 /usr/include/
 cp -R include/asm-x86_64 /usr/include/
 cp -R include/asm-x86_64-biarch /usr/include/asm
-cp -R include/linux /usr/include</userinput></screen>
+cp -R include/linux /usr/include
+cp -R include/mtd /usr/include
+cp -R include/sound /usr/include
+cp -R include/scsi /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>chown -R root:root /usr/include/{asm,asm-i386,asm-x86_64,linux}</userinput></screen>
+<screen><userinput>chown -R root:root /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,sound,scsi}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>find /usr/include/{asm,asm-i386,asm-x86_64,linux} -type d -exec chmod 755 {} \;
-find /usr/include/{asm,asm-i386,asm-x86_64,linux} -type f -exec chmod 644 {} \;</userinput></screen>
+<screen><userinput>find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,sound,scsi} -type d -exec chmod 755 {} \;
+find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,sound,scsi} -type f -exec chmod 644 {} \;</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -63,6 +63,26 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='d5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/x86_64-64/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64-64/linux-libc-headers.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/final-system/x86_64-64/linux-libc-headers.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -52,7 +52,10 @@
 
 <screen><userinput>install -d /usr/include
 cp -R include/asm-x86_64 /usr/include/asm
-cp -R include/linux /usr/include</userinput></screen>
+cp -R include/linux /usr/include
+cp -R include/mtd /usr/include
+cp -R include/sound /usr/include
+cp -R include/scsi /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/general.ent	2005-08-31 19:43:14 UTC (rev 6786)
@@ -56,7 +56,7 @@
 <!ENTITY findutils-version "4.2.23">
 <!ENTITY flex-version "2.5.31">
 <!ENTITY gawk-version "3.1.5">
-<!ENTITY gcc-version "3.4.4">
+<!ENTITY gcc-version "4.0.1">
 <!ENTITY gettext-version "0.14.5">
 <!ENTITY glibc-version "2.3.5">
 <!ENTITY grep-version "2.5.1a">
@@ -72,14 +72,14 @@
 <!ENTITY lfs-bootscripts-version "3.2.2">
 <!ENTITY libtool-version "1.5.18">
 <!ENTITY linux-dl-version "2.6">
-<!ENTITY linux-x86-version "2.6.12.5">
-<!ENTITY linux-x86_64-version "2.6.12.5">
-<!ENTITY linux-ppc-version "2.6.12.5">
-<!ENTITY linux-mips-version "2.6.12.5">
-<!ENTITY linux-mips64-version "2.6.12.5">
-<!ENTITY linux-sparc-version "2.6.12.5">
-<!ENTITY linux-sparc64-version "2.6.12.5">
-<!ENTITY linux-alpha-version "2.6.12.5">
+<!ENTITY linux-x86-version "2.6.12.6">
+<!ENTITY linux-x86_64-version "2.6.12.6">
+<!ENTITY linux-ppc-version "2.6.12.6">
+<!ENTITY linux-mips-version "2.6.12.6">
+<!ENTITY linux-mips64-version "2.6.12.6">
+<!ENTITY linux-sparc-version "2.6.12.6">
+<!ENTITY linux-sparc64-version "2.6.12.6">
+<!ENTITY linux-alpha-version "2.6.12.6">
 <!ENTITY linux-libc-headers-x86-version "2.6.12.0">
 <!ENTITY linux-libc-headers-x86_64-version "2.6.12.0">
 <!ENTITY linux-libc-headers-ppc-version "2.6.12.0">
@@ -95,7 +95,6 @@
 <!ENTITY mktemp-version "1.5">
 <!ENTITY module-init-tools-version "3.1">
 <!ENTITY ncurses-version "5.4">
-<!ENTITY netkit_base-version "0.17">
 <!ENTITY patch-version "2.5.9">
 <!ENTITY parted-version "1.6.24">
 <!ENTITY perl-version "5.8.7">

Modified: branches/cross-lfs/BOOK/introduction/alpha/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/alpha/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/alpha/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -31,7 +31,7 @@
     <title>Added:</title>
 
     <listitem>
-      <para>None</para>
+      <para>&gcc-specs-patch;</para>
     </listitem>
   </itemizedlist>
 

Modified: branches/cross-lfs/BOOK/introduction/common/changelog.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/changelog.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/common/changelog.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -39,6 +39,18 @@
 -->
 
     <listitem>
+      <para>August 31, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated to GCC 4.0.1.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Updated to Linux 2.6.12.6.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 28, 2005</para>
       <itemizedlist>
         <listitem>

Modified: branches/cross-lfs/BOOK/introduction/common/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/common/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -137,9 +137,6 @@
       <para>&gcc-cross_search-patch;</para>
     </listitem>
     <listitem>
-      <para>&gcc-specs-patch;</para>
-    </listitem>
-    <listitem>
       <para>&gcc-posix-patch;</para>
     </listitem>
     <listitem>
@@ -149,9 +146,27 @@
       <para>&glibc-libgcc_eh-patch;</para>
     </listitem>
     <listitem>
+      <para>&glibc-gcc4-fix_elf-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&glibc-gcc4_fix_iconvdata-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&glibc-gcc4_fix_string-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&glibc-gcc4_fix_symbols-patch;</para>
+    </listitem>
+    <listitem>
       <para>&gzip-security_fix-patch;</para>
     </listitem>
     <listitem>
+      <para>&inetutils-gcc4_fixes-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&kbd-gcc4_fixes-patch;</para>
+    </listitem>
+    <listitem>
       <para>&ncurses-update-patch; (Patch)</para>
     </listitem>
     <listitem>

Modified: branches/cross-lfs/BOOK/introduction/mips/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/mips/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/mips/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -35,6 +35,9 @@
       <para>Colo &colo-version;</para>
     </listitem>
     <listitem>
+      <para>&gcc-specs-patch;</para>
+    </listitem>
+    <listitem>
       <para>&glibc-mips_syscall-patch;</para>
     </listitem>
     <listitem>

Modified: branches/cross-lfs/BOOK/introduction/mips64/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/mips64/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/mips64/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -35,6 +35,9 @@
       <para>Colo &colo-version;</para>
     </listitem>
     <listitem>
+      <para>&gcc-specs-patch;</para>
+    </listitem>
+    <listitem>
       <para>&glibc-mips_syscall-patch;</para>
     </listitem>
     <listitem>

Added: branches/cross-lfs/BOOK/introduction/mips64-64/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/mips64-64/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/mips64-64/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+  %general-entities;
+  %patches-entities;
+]>
+
+<sect1 id="ch-intro-whatsnew-mips64">
+  <?dbhtml filename="whatsnew-mips64.html"?>
+
+  <title>What's new for MIPS 64 Bit</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/whatsnew.xml"
+  xpointer="xpointer(/sect1/para[1])"/>
+
+  <itemizedlist>
+    <title>Upgraded to:</title>
+
+    <listitem>
+      <para>Linux &linux-mips64-version;</para>
+    </listitem>
+    <listitem>
+      <para>Linux-libc-headers &linux-libc-headers-mips64-version;</para>
+    </listitem>
+  </itemizedlist>
+
+
+  <itemizedlist>
+    <title>Added:</title>
+
+    <listitem>
+      <para>Colo &colo-version;</para>
+    </listitem>
+    <listitem>
+      <para>&gcc-pure64-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&gcc-specs_pure64-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&glibc-mips_syscall-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&linux-mips-patch;</para>
+    </listitem>
+  </itemizedlist>
+
+</sect1>

Added: branches/cross-lfs/BOOK/introduction/mips64-64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/mips64-64-chapter.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/mips64-64-chapter.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-intro" xreflabel="Introduction">
+  <?dbhtml dir="introduction"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Introduction</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/buildinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/whatsnew.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/changelog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
+
+</chapter>

Modified: branches/cross-lfs/BOOK/introduction/ppc/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/ppc/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/ppc/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -32,6 +32,9 @@
     <title>Added:</title>
 
     <listitem>
+      <para>&gcc-specs-patch;</para>
+    </listitem>
+    <listitem>
       <para>Parted &parted-version;</para>
     </listitem>
     <listitem>

Modified: branches/cross-lfs/BOOK/introduction/sparc/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/sparc/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/sparc/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -31,6 +31,9 @@
     <title>Added:</title>
 
     <listitem>
+      <para>&gcc-specs-patch;</para>
+    </listitem>
+    <listitem>
       <para>Silo &silo-version;</para>
     </listitem>
     <listitem>
@@ -42,12 +45,6 @@
     <listitem>
       <para>elftoaout &elftoaout-version;</para>
     </listitem>
-    <listitem>
-      <para>Netkit Base &netkit_base-version;</para>
-    </listitem>
-    <listitem>
-      <para>&netkit_base-fixes-patch;</para>
-    </listitem>
   </itemizedlist>
 
   <itemizedlist>

Modified: branches/cross-lfs/BOOK/introduction/sparc64/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/sparc64/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/sparc64/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -31,6 +31,9 @@
     <title>Added:</title>
 
     <listitem>
+      <para>&gcc-specs-patch;</para>
+    </listitem>
+    <listitem>
       <para>Silo &silo-version;</para>
     </listitem>
     <listitem>
@@ -48,12 +51,6 @@
     <listitem>
       <para>elftoaout &elftoaout-version;</para>
     </listitem>
-    <listitem>
-      <para>Netkit Base &netkit_base-version;</para>
-    </listitem>
-    <listitem>
-      <para>&netkit_base-fixes-patch;</para>
-    </listitem>
   </itemizedlist>
 
   <itemizedlist>

Added: branches/cross-lfs/BOOK/introduction/sparc64-64/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/sparc64-64/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/sparc64-64/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+  %general-entities;
+  %patches-entities;
+]>
+
+<sect1 id="ch-intro-whatsnew-sparc64">
+  <?dbhtml filename="whatsnew-sparc64.html"?>
+
+  <title>What's new for Sparc64</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/whatsnew.xml"
+  xpointer="xpointer(/sect1/para[1])"/>
+
+  <itemizedlist>
+    <title>Upgraded to:</title>
+
+    <listitem>
+      <para>Linux &linux-sparc64-version;</para>
+    </listitem>
+    <listitem>
+      <para>Linux-libc-headers &linux-libc-headers-sparc64-version;</para>
+    </listitem>
+  </itemizedlist>
+
+  <itemizedlist>
+    <title>Added:</title>
+
+    <listitem>
+      <para>&gcc-pure64-patch;</para>
+    </listitem>
+     <listitem>
+      <para>&gcc-specs_pure64-patch;</para>
+    </listitem>
+    <listitem>
+      <para>Silo &silo-version;</para>
+    </listitem>
+    <listitem>
+      <para>&silo-fixes-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&linux-libc-headers-sparc_biarch-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&binutils-multilib-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&kbd-sparc_kbdrate-patch;</para>
+    </listitem>
+    <listitem>
+      <para>elftoaout &elftoaout-version;</para>
+    </listitem>
+  </itemizedlist>
+
+  <itemizedlist>
+    <title>Removed:</title>
+
+    <listitem>
+      <para>None</para>
+    </listitem>
+  </itemizedlist>
+
+</sect1>

Added: branches/cross-lfs/BOOK/introduction/sparc64-64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/sparc64-64-chapter.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/sparc64-64-chapter.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-intro" xreflabel="Introduction">
+  <?dbhtml dir="introduction"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Introduction</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/whatsnew.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/changelog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
+
+</chapter>

Modified: branches/cross-lfs/BOOK/introduction/x86/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/x86/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/x86/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -33,7 +33,7 @@
     <title>Added:</title>
 
     <listitem>
-      <para>None</para>
+      <para>&gcc-specs-patch;</para>
     </listitem>
   </itemizedlist>
 

Modified: branches/cross-lfs/BOOK/introduction/x86_64/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/x86_64/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/x86_64/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -35,7 +35,7 @@
     <title>Added:</title>
 
     <listitem>
-      <para>None</para>
+      <para>&gcc-specs-patch;</para>
     </listitem>
   </itemizedlist>
 

Added: branches/cross-lfs/BOOK/introduction/x86_64-64/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/x86_64-64/whatsnew.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/x86_64-64/whatsnew.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+  %general-entities;
+  %patches-entities;
+]>
+
+<sect1 id="ch-intro-whatsnew-x86_64">
+  <?dbhtml filename="whatsnew-x86_64.html"?>
+
+  <title>What's New for x86_64</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/whatsnew.xml"
+  xpointer="xpointer(/sect1/para[1])"/>
+
+  <itemizedlist>
+    <title>Upgraded to:</title>
+
+    <listitem>
+      <para>Linux &linux-x86_64-version;</para>
+    </listitem>
+    <listitem>
+      <para>Linux-libc-headers &linux-libc-headers-x86_64-version;</para>
+    </listitem>
+    <listitem>
+      <para>GRUB &grub-version;</para>
+    </listitem>
+  </itemizedlist>
+
+
+  <itemizedlist>
+    <title>Added:</title>
+
+    <listitem>
+      <para>&gcc-pure64-patch;</para>
+    </listitem>
+    <listitem>
+      <para>&gcc-specs_pure64-patch;</para>
+    </listitem>
+  </itemizedlist>
+
+  <itemizedlist>
+    <title>Removed:</title>
+
+    <listitem>
+      <para>None</para>
+    </listitem>
+  </itemizedlist>
+
+</sect1>

Added: branches/cross-lfs/BOOK/introduction/x86_64-64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/x86_64-64-chapter.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/introduction/x86_64-64-chapter.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-intro" xreflabel="Introduction">
+  <?dbhtml dir="introduction"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Introduction</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/whatsnew.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/changelog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
+  <!-- This page is only for published versions if the LiveCD is included
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/livecd.xml"/>
+  -->
+
+</chapter>

Modified: branches/cross-lfs/BOOK/materials/alpha/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/alpha/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/alpha/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -15,10 +15,10 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>None:</term>
+      <term>GCC Specs Patch - 14 KB:</term>
       <listitem>
         <para><ulink
-        url=""/></para>
+        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
       </listitem>
     </varlistentry>
 

Modified: branches/cross-lfs/BOOK/materials/common/packages.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/common/packages.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/common/packages.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -152,7 +152,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC (&gcc-version;) - 26.8 MB:</term>
+      <term>GCC (&gcc-version;) - 30.3 MB:</term>
       <listitem>
         <para><ulink
         url="&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2"/></para>

Modified: branches/cross-lfs/BOOK/materials/common/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/common/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/common/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -101,46 +101,70 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC Linkonce Patch - 12 KB:</term>
+      <term>GCC Posix Patch - 9 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;gcc/&gcc-linkonce-patch;"/></para>
+        url="&patches-root;gcc/&gcc-posix-patch;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>GCC Posix Patch - 11 KB:</term>
+      <term>GCC Specs Patch - 14 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;gcc/&gcc-posix-patch;"/></para>
+        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
+      <term>Glibc Disable linking with libgcc_eh.a - 1 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
+        url="&patches-root;glibc/&glibc-libgcc_eh-patch;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Glibc Test Patch - 11 KB:</term>
+      <term>Glibc GCC 4.x Fix ELF Patch - 19 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;glibc/&glibc-testfix-patch;"/></para>
+        url="&patches-root;glibc/&glibc-gcc4-fix_elf-patch;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Glibc Disable linking with libgcc_eh.a - 1 KB:</term>
+      <term>Glibc GCC 4.x Fix iconvdata Patch - 2 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;glibc/&glibc-libgcc_eh-patch;"/></para>
+        url="&patches-root;glibc/&glibc-gcc4_fix_iconvdata-patch;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
+      <term>Glibc GCC 4.x Fix String Patch - 3 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;glibc/&glibc-gcc4_fix_string-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Glibc GCC 4.x Fix Symbols Patch - 5 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;glibc/&glibc-gcc4_fix_symbols-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Glibc Test Patch - 11 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;glibc/&glibc-testfix-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Gzip Security Fix Patch - 2 KB:</term>
       <listitem>
         <para><ulink
@@ -157,6 +181,22 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Inetutils GCC 4.x Fixes Patch - 2 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;inetutils/&inetutils-gcc4_fixes-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>KBD GCC 4.x Fixes Patch - 2 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;kbd/&kbd-gcc4_fixes-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Mktemp Tempfile Patch - 3 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/materials/mips/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/mips/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/mips/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -15,6 +15,14 @@
   <variablelist role="materials">
 
     <varlistentry>
+      <term>GCC Specs Patch - 14 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>GLIBC Syscall Patch - 11 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/materials/mips64/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/mips64/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/mips64/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -23,6 +23,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>GCC Specs Patch - 14 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>GLIBC Syscall Patch - 11 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/materials/mips64-64/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/mips64-64/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/mips64-64/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -15,6 +15,14 @@
   <variablelist role="materials">
 
     <varlistentry>
+      <term>GCC Specs Patch - 14 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-specs_pure64-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>GLIBC Syscall Patch - 11 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/materials/ppc/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/ppc/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/ppc/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -15,6 +15,14 @@
   <variablelist role="materials">
 
     <varlistentry>
+      <term>GCC Specs Patch - 14 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Yaboot (&yaboot-version;) - 1 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/materials/sparc/packages.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/sparc/packages.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/sparc/packages.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -37,14 +37,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Netkit Base (&netkit_base-version;) - 56 KB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-&netkit_base-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Silo (&silo-version;) - 144 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/materials/sparc/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/sparc/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/sparc/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -14,32 +14,40 @@
 
   <variablelist role="materials">
 
-   <varlistentry>
-      <term>KBD kbdrate Patch - 1 KB:</term>
+    <varlistentry>
+      <term>GCC Specs Patch - 14 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;grep/&kbd-sparc_kbdrate-patch;"/></para>
+        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-libc-headers Sparc Conflicts Patch - 1 KB:</term>
+      <term>Glibc GCC 4.x Sparc Fixes Patch - 1 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-sparc_conflicts-patch;"/></para>
+        url="&patches-root;glibc/&glibc-sparc_gcc4_fixes-patch;"/></para>
       </listitem>
     </varlistentry>
 
+   <varlistentry>
+      <term>KBD kbdrate Patch - 1 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;grep/&kbd-sparc_kbdrate-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
-      <term>Netkit Base Fixes Patch - 4.1 KB:</term>
+      <term>Linux-libc-headers Sparc Conflicts Patch - 1 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;netkit-base/&netkit_base-fixes-patch;"/></para>
+        url="&patches-root;linux-libc-headers/&linux-libc-headers-sparc_conflicts-patch;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Silo Fixes Patch - 3.5 KB:</term>
+      <term>Silo Fixes Patch - 4 KB:</term>
       <listitem>
         <para><ulink
         url="&patches-root;silo/&silo-fixes-patch;"/></para>

Modified: branches/cross-lfs/BOOK/materials/sparc64/packages.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/sparc64/packages.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/sparc64/packages.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -37,14 +37,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Netkit Base (&netkit_base-version;) - 56 KB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-&netkit_base-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Silo (&silo-version;) - 144 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/materials/sparc64/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/sparc64/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/sparc64/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -23,6 +23,22 @@
     </varlistentry>
 
     <varlistentry>
+      <term>GCC Specs Patch - 14 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Glibc GCC 4.x Sparc Fixes Patch - 1 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;glibc/&glibc-sparc_gcc4_fixes-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Linux-libc-headers Sparc Biarch Patch - 80 KB:</term>
       <listitem>
         <para><ulink
@@ -47,17 +63,9 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Netkit Base Fixes Patch - 4.1 KB:</term>
+      <term>Silo Fixes Patch - 4 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;netkit-base/&netkit_base-fixes-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Silo Fixes Patch - 3.5 KB:</term>
-      <listitem>
-        <para><ulink
         url="&patches-root;silo/&silo-fixes-patch;"/></para>
       </listitem>
     </varlistentry>

Modified: branches/cross-lfs/BOOK/materials/sparc64-64/packages.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/sparc64-64/packages.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/sparc64-64/packages.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -37,14 +37,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Netkit Base (&netkit_base-version;) - 56 KB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-&netkit_base-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Silo (&silo-version;) - 144 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/materials/sparc64-64/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/sparc64-64/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/sparc64-64/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -23,29 +23,37 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-libc-headers Sparc Conflicts Patch - 1 KB:</term>
+      <term>GCC Specs Patch - 14 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-sparc_conflicts-patch;"/></para>
+        url="&patches-root;gcc/&gcc-specs_pure64-patch;"/></para>
       </listitem>
     </varlistentry>
 
-   <varlistentry>
-      <term>KBD kbdrate Patch - 1 KB:</term>
+    <varlistentry>
+      <term>Glibc GCC 4.x Sparc Fixes Patch - 1 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;grep/&kbd-sparc_kbdrate-patch;"/></para>
+        url="&patches-root;glibc/&glibc-sparc_gcc4_fixes-patch;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Netkit Base Fixes Patch - 4.1 KB:</term>
+      <term>Linux-libc-headers Sparc Conflicts Patch - 1 KB:</term>
       <listitem>
         <para><ulink
-        url="&patches-root;netkit-base/&netkit_base-fixes-patch;"/></para>
+        url="&patches-root;linux-libc-headers/&linux-libc-headers-sparc_conflicts-patch;"/></para>
       </listitem>
     </varlistentry>
 
+   <varlistentry>
+      <term>KBD kbdrate Patch - 1 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;grep/&kbd-sparc_kbdrate-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Silo Fixes Patch - 3.5 KB:</term>
       <listitem>

Modified: branches/cross-lfs/BOOK/materials/x86/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/x86/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/x86/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -22,6 +22,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>GCC Specs Patch - 14 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/materials/x86_64/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/x86_64/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/x86_64/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -31,6 +31,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>GCC Specs Patch - 14 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Linux-libc-headers x86_64 Biarch Patch - 99 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/materials/x86_64-64/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/x86_64-64/patches.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/materials/x86_64-64/patches.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -30,6 +30,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>GCC Specs Patch - 14 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-specs_pure64-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/mips64-64-index.xml
===================================================================
--- branches/cross-lfs/BOOK/mips64-64-index.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/mips64-64-index.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -14,7 +14,7 @@
 <part id="part1">
 <title>Introduction</title>
 <?dbhtml filename="part1.html"?>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/mips64-chapter.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/mips64-64-chapter.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/mips64-chapter.xml"/>
 </part>
 

Modified: branches/cross-lfs/BOOK/patches.ent
===================================================================
--- branches/cross-lfs/BOOK/patches.ent	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/patches.ent	2005-08-31 19:43:14 UTC (rev 6786)
@@ -17,19 +17,25 @@
 
 <!ENTITY gcc-cross_search-patch "gcc-&gcc-version;-cross_search_paths-1.patch">
 <!ENTITY gcc-fix_native-patch  "gcc-&gcc-version;-fix_configure_for_target_native-1.patch">
-<!ENTITY gcc-linkonce-patch "gcc-&gcc-version;-linkonce-1.patch">
 <!ENTITY gcc-posix-patch "gcc-&gcc-version;-posix-1.patch">
 <!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-2.patch">
-<!ENTITY gcc-specs_pure64-patch "gcc-&gcc-version;-specs_pure64-1.patch">
+<!ENTITY gcc-specs_pure64-patch "gcc-&gcc-version;-pure64_specs-1.patch">
 <!ENTITY gcc-pure64-patch "gcc-&gcc-version;-pure64-1.patch">
 
 <!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-1.patch">
 <!ENTITY glibc-testfix-patch "glibc-&glibc-version;-fix_test-1.patch">
+<!ENTITY glibc-gcc4-fix_elf-patch "glibc-&glibc-version;-gcc4_fix_elf-2.patch">
+<!ENTITY glibc-gcc4_fix_iconvdata-patch "glibc-&glibc-version;-gcc4_fix_iconvdata-1.patch">
+<!ENTITY glibc-gcc4_fix_string-patch "glibc-&glibc-version;-gcc4_fix_string-1.patch">
+<!ENTITY glibc-gcc4_fix_symbols-patch "glibc-&glibc-version;-gcc4_fix_symbols-1.patch">
 
 <!ENTITY gzip-security_fix-patch "gzip-&gzip-version;-security_fixes-1.patch">
 
 <!ENTITY inetutils-man_pages-patch "inetutils-&inetutils-version;-no_server_man_pages-1.patch">
+<!ENTITY inetutils-gcc4_fixes-patch "inetutils-&inetutils-version;-gcc4_fixes-3.patch">
 
+<!ENTITY kbd-gcc4_fixes-patch "kbd-&kbd-version;-gcc4_fixes-1.patch">
+
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-2.patch">
 
 <!ENTITY ncurses-update-patch "ncurses-&ncurses-version;-20050319-patch.sh.bz2">
@@ -43,6 +49,7 @@
 <!ENTITY tar-sparse_fix-patch "tar-&tar-version;-sparse_fix-1.patch">
 
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
+<!ENTITY util-linux-gcc4_fixes-patch "util-linux-&util-linux-version;-gcc4_fixes-1.patch">
 
 <!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch">
 
@@ -62,13 +69,13 @@
 
 <!-- Start of sparc/sparc64 patches -->
 
+<!ENTITY glibc-sparc_gcc4_fixes-patch "glibc-&glibc-version;-sparc_gcc4_fixes-1.patch">
+
 <!ENTITY linux-libc-headers-sparc_biarch-patch "linux-libc-headers-&linux-libc-headers-sparc64-version;-sparc_biarch-1.patch">
 <!ENTITY linux-libc-headers-sparc_conflicts-patch "linux-libc-headers-&linux-libc-headers-sparc-version;-sparc_conflicts-1.patch">
 
 <!ENTITY kbd-sparc_kbdrate-patch "kbd-&kbd-version;-sparc_kbdrate-1.patch">
 
-<!ENTITY netkit_base-fixes-patch "netkit-base-&netkit_base-version;-fixes-1.patch">
-
 <!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-3.patch">
 
 <!-- Start of mips/mips64 patches -->

Modified: branches/cross-lfs/BOOK/sparc64-64-index.xml
===================================================================
--- branches/cross-lfs/BOOK/sparc64-64-index.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/sparc64-64-index.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -18,7 +18,7 @@
 
     <title>Introduction</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/sparc64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/sparc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/sparc64-chapter.xml"/>
 
   </part>

Modified: branches/cross-lfs/BOOK/temp-system/alpha/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/alpha/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/alpha/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/alpha/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/temp-system/mips/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/mips/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/mips/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/mips/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/temp-system/mips64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/mips64/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/mips64/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/mips64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/mips64-64/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/mips64-64/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/mips64-64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/temp-system/ppc/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/ppc/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/ppc/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/ppc/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/temp-system/sparc/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/sparc/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/sparc/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/sparc/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/temp-system/sparc64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/sparc64/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/sparc64/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/sparc64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/temp-system/sparc64-64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/sparc64-64/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/sparc64-64/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/sparc64-64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/temp-system/x86/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/x86/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/x86/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -59,11 +59,6 @@
     href="../../cross-tools/x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='ad'])"/>
 
-    <para os="ca">Fixes configure logic when 'target triplet' =
-    'target triplet':</para>
-
-<screen os="cb"><userinput>patch -Np1 -i ../&gcc-fix_native-patch;</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>

Modified: branches/cross-lfs/BOOK/temp-system/x86_64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/x86_64/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/x86_64/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/x86_64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/temp-system/x86_64-64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/x86_64-64/gcc.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/temp-system/x86_64-64/gcc.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -60,14 +60,6 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/x86_64-64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 

Modified: branches/cross-lfs/BOOK/x86_64-64-index.xml
===================================================================
--- branches/cross-lfs/BOOK/x86_64-64-index.xml	2005-08-31 19:14:38 UTC (rev 6785)
+++ branches/cross-lfs/BOOK/x86_64-64-index.xml	2005-08-31 19:43:14 UTC (rev 6786)
@@ -18,7 +18,7 @@
 
     <title>Introduction</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/x86_64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/x86_64-chapter.xml"/>
 
   </part>




More information about the lfs-book mailing list