r1362 - / trunk/BOOK trunk/BOOK/cross-tools trunk/BOOK/cross-tools/alpha trunk/BOOK/cross-tools/mips trunk/BOOK/cross-tools/mips64 trunk/BOOK/cross-tools/mips64-64 trunk/BOOK/cross-tools/sparc trunk/BOOK/cross-tools/sparc64 trunk/BOOK/cross-tools/sparc64-64 trunk/BOOK/final-system trunk/BOOK/final-system/alpha trunk/BOOK/final-system/mips trunk/BOOK/final-system/mips64 trunk/BOOK/final-system/mips64-64 trunk/BOOK/final-system/sparc trunk/BOOK/final-system/sparc64 trunk/BOOK/final-system/sparc64-64 trunk/BOOK/introduction/common trunk/BOOK/materials trunk/BOOK/materials/alpha trunk/BOOK/materials/mips trunk/BOOK/materials/mips64 trunk/BOOK/materials/mips64-64 trunk/BOOK/materials/sparc trunk/BOOK/materials/sparc64 trunk/BOOK/materials/sparc64-64 trunk/BOOK/prologue trunk/BOOK/stylesheets trunk/BOOK/temp-system

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Apr 12 16:38:34 PDT 2006


Author: jim
Date: 2006-04-12 17:38:31 -0600 (Wed, 12 Apr 2006)
New Revision: 1362

Removed:
   trunk/BOOK/cross-tools/sparcv8-chapter.xml
   trunk/BOOK/cross-tools/sparcv8/
   trunk/BOOK/final-system/sparcv8-chapter.xml
   trunk/BOOK/final-system/sparcv8/
   trunk/BOOK/materials/sparcv8-chapter.xml
   trunk/BOOK/materials/sparcv8/
   trunk/BOOK/prologue/sparcv8/
   trunk/BOOK/sparcv8-index.xml
   trunk/BOOK/temp-system/sparcv8-chapter.xml
   trunk/BOOK/temp-system/sparcv8/
Modified:
   /
   trunk/BOOK/
   trunk/BOOK/Makefile
   trunk/BOOK/cross-tools/alpha/glibc.xml
   trunk/BOOK/cross-tools/mips/glibc.xml
   trunk/BOOK/cross-tools/mips64-64/glibc.xml
   trunk/BOOK/cross-tools/mips64/glibc-64bit.xml
   trunk/BOOK/cross-tools/mips64/glibc-n32.xml
   trunk/BOOK/cross-tools/mips64/glibc.xml
   trunk/BOOK/cross-tools/sparc/glibc.xml
   trunk/BOOK/cross-tools/sparc64-64/glibc.xml
   trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml
   trunk/BOOK/cross-tools/sparc64/glibc.xml
   trunk/BOOK/final-system/alpha/glibc.xml
   trunk/BOOK/final-system/mips/glibc.xml
   trunk/BOOK/final-system/mips64-64/glibc.xml
   trunk/BOOK/final-system/mips64/glibc-64bit.xml
   trunk/BOOK/final-system/mips64/glibc-n32.xml
   trunk/BOOK/final-system/mips64/glibc.xml
   trunk/BOOK/final-system/sparc/glibc.xml
   trunk/BOOK/final-system/sparc64-64/glibc.xml
   trunk/BOOK/final-system/sparc64/glibc-64bit.xml
   trunk/BOOK/final-system/sparc64/glibc.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/materials/alpha/patches.xml
   trunk/BOOK/materials/mips/patches.xml
   trunk/BOOK/materials/mips64-64/patches.xml
   trunk/BOOK/materials/mips64/patches.xml
   trunk/BOOK/materials/sparc/patches.xml
   trunk/BOOK/materials/sparc64-64/patches.xml
   trunk/BOOK/materials/sparc64/patches.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/patches.ent
   trunk/BOOK/stylesheets/top-index.xsl
Log:
 r2836 at server (orig r1362):  jim | 2006-04-12 16:17:11 -0700
  r2835 at server:  jim | 2006-04-12 16:16:31 -0700
  Updated to Glibc 2.4
 



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


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:2823
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:2835
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/Makefile
===================================================================
--- trunk/BOOK/Makefile	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/Makefile	2006-04-12 23:38:31 UTC (rev 1362)
@@ -3,7 +3,7 @@
 DLLISTDIR=~/cross-lfs-dllist
 CHUNK_QUIET=1
 XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-current
-ARCH=x86 x86_64 x86_64-64 sparc sparcv8 sparc64 sparc64-64 mips mips64 mips64-64 ppc ppc64 alpha
+ARCH=x86 x86_64 x86_64-64 sparc sparc64 sparc64-64 mips mips64 mips64-64 ppc ppc64 alpha
 
 # HTML Rendering Chunked
 define HTML_RENDER

Modified: trunk/BOOK/cross-tools/alpha/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/alpha/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/alpha/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -35,14 +35,6 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 

Modified: trunk/BOOK/cross-tools/mips/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/mips/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/mips/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -27,28 +27,20 @@
     xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='g1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/glibc-64bit.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/mips64/glibc-64bit.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -28,30 +28,22 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
+    xpointer="xpointer(//*[@os='g1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
+    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/glibc-n32.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/mips64/glibc-n32.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -28,30 +28,22 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
+    xpointer="xpointer(//*[@os='g1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
+    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/mips64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/mips64/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -27,28 +27,20 @@
     xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='g1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/mips64-64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64-64/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/mips64-64/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -27,6 +27,14 @@
     xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='db'])"/>
 
@@ -43,22 +51,6 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: trunk/BOOK/cross-tools/sparc/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/sparc/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -35,14 +35,6 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 

Modified: trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -36,14 +36,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/sparc64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/sparc64/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -35,14 +35,6 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 

Modified: trunk/BOOK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64-64/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/sparc64-64/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -43,14 +43,6 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Deleted: trunk/BOOK/cross-tools/sparcv8-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/sparcv8-chapter.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/cross-tools/sparcv8-chapter.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -1,23 +0,0 @@
-<?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-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-final.xml"/>
-
-</chapter>

Modified: trunk/BOOK/final-system/alpha/glibc.xml
===================================================================
--- trunk/BOOK/final-system/alpha/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/alpha/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -38,14 +38,6 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: trunk/BOOK/final-system/mips/glibc.xml
===================================================================
--- trunk/BOOK/final-system/mips/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/mips/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -29,6 +29,11 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
+    <para os="g1">MIPS is no longer supported in the main glibc tree, so we have to
+    extract the glibc-ports into our glibc-&glibc-version; directory.</para>
+
+<screen os="g2"><userinput>tar -jxvf glibc-ports-&glibc-ports-version;.tar.bz2</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -37,14 +42,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-   <para os="p1">This patch will address a REMAP issue that occurs on the alpha/mips platforms:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&glibc-remap-patch;</userinput></screen>
-
-   <para os="m1">This patch will add NPTL support to MIPS, this will allow us to use NPTL:</para>
-
-<screen os="m2"><userinput>patch -Np1 -i ../&glibc-mips_nptl-patch;</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>

Modified: trunk/BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- trunk/BOOK/final-system/mips64/glibc-64bit.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/mips64/glibc-64bit.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -27,30 +27,22 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='g1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <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: trunk/BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- trunk/BOOK/final-system/mips64/glibc-n32.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/mips64/glibc-n32.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -26,28 +26,20 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='g1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"

Modified: trunk/BOOK/final-system/mips64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/mips64/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/mips64/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -31,28 +31,20 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='g1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/mips64-64/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -30,28 +30,20 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='g1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/sparc/glibc.xml
===================================================================
--- trunk/BOOK/final-system/sparc/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/sparc/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -37,10 +37,6 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-   <para os="s1">This patch will add TLS (Thread Local Storage) support to Sparc:</para>
-
-<screen os="s2"><userinput>patch -Np1 -i ../&glibc-sparc_tls-patch;</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>

Modified: trunk/BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/glibc-64bit.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/sparc64/glibc-64bit.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -35,14 +35,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <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: trunk/BOOK/final-system/sparc64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/sparc64/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -39,14 +39,6 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: trunk/BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64/glibc.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/sparc64-64/glibc.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -38,14 +38,6 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Deleted: trunk/BOOK/final-system/sparcv8-chapter.xml
===================================================================
--- trunk/BOOK/final-system/sparcv8-chapter.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/final-system/sparcv8-chapter.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -1,72 +0,0 @@
-<?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-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <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="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
-  <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="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.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="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.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/tar.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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -40,6 +40,9 @@
       <para>April 12, 2006</para>
       <itemizedlist>
         <listitem>
+          <para>[jim] - Updated to Glibc 2.4.</para>
+        </listitem>
+        <listitem>
           <para>[jim] - Updated to latest bash patch -7.</para>
         </listitem>
       </itemizedlist>

Modified: trunk/BOOK/materials/alpha/patches.xml
===================================================================
--- trunk/BOOK/materials/alpha/patches.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/materials/alpha/patches.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -24,10 +24,6 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-remap-patch'])"/>
-
   </variablelist>
 
 </sect1>

Modified: trunk/BOOK/materials/mips/patches.xml
===================================================================
--- trunk/BOOK/materials/mips/patches.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/materials/mips/patches.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -48,22 +48,6 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry os="glibc-mips_nptl-patch">
-      <term>Glibc MIPS NPTL Patch - 16 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-mips_nptl-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="glibc-remap-patch">
-      <term>Glibc Remap Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-remap-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="grep-mips_update-patch">
       <term>Grep Config Update Patch - 48 KB:</term>
       <listitem>

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/materials/mips64/patches.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -45,14 +45,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-mips_nptl-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-remap-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='grep-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/materials/mips64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/patches.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -42,14 +42,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-mips_nptl-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-remap-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='grep-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/materials/sparc/patches.xml
===================================================================
--- trunk/BOOK/materials/sparc/patches.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/materials/sparc/patches.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -40,14 +40,6 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry os="glibc-sparc_tls-patch">
-      <term>Glibc Sparc TLS Patch - 3.4 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-sparc_tls-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
    <varlistentry os="kbd-sparc_kbdrate-patch">
       <term>KBD kbdrate Patch - 1 KB:</term>
       <listitem>

Modified: trunk/BOOK/materials/sparc64/patches.xml
===================================================================
--- trunk/BOOK/materials/sparc64/patches.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/materials/sparc64/patches.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -34,10 +34,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-sparc_tls-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
     xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>
 
     <varlistentry>

Modified: trunk/BOOK/materials/sparc64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/sparc64-64/patches.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/materials/sparc64-64/patches.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -34,10 +34,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-sparc_tls-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
     xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Deleted: trunk/BOOK/materials/sparcv8-chapter.xml
===================================================================
--- trunk/BOOK/materials/sparcv8-chapter.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/materials/sparcv8-chapter.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -1,20 +0,0 @@
-<?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-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/patches.xml"/>
-
-</chapter>

Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/packages.ent	2006-04-12 23:38:31 UTC (rev 1362)
@@ -101,13 +101,13 @@
 <!ENTITY gettext-size "6.8 MB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
 
-<!ENTITY glibc-version "20051107">
-<!ENTITY glibc-size "15 MB">
-<!ENTITY glibc-url "ftp://ftp.lfs-matrix.net/pub/lfs/clfs-packages/common/glibc-&glibc-version;.tar.bz2">
+<!ENTITY glibc-version "2.4">
+<!ENTITY glibc-size "14.5 MB">
+<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
 
-<!ENTITY glibc-ports-version "20051107">
-<!ENTITY glibc-ports-size "472 KB">
-<!ENTITY glibc-ports-url "ftp://ftp.lfs-matrix.net/pub/lfs/clfs-packages/sparcv8/glibc-ports-&glibc-ports-version;.tar.bz2">
+<!ENTITY glibc-ports-version "&glibc-version;">
+<!ENTITY glibc-ports-size "534 KB">
+<!ENTITY glibc-ports-url "&gnu;glibc/glibc-ports-&glibc-ports-version;.tar.bz2">
 
 <!ENTITY grep-version "2.5.1a">
 <!ENTITY grep-size "516 KB">

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/patches.ent	2006-04-12 23:38:31 UTC (rev 1362)
@@ -23,11 +23,7 @@
 
 <!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-1.patch">
 <!ENTITY glibc-localedef_segfault-patch "glibc-&glibc-version;-localedef_segfault-1.patch">
-<!ENTITY glibc-remap-patch "glibc-&glibc-version;-remap_update-1.patch">
 
-<!ENTITY glibc-linuxthreads-libgcc_eh-patch "glibc-&glibc-linuxthreads-version;-libgcc_eh-1.patch">
-<!ENTITY glibc-linuxthreads-localedef_segfault-patch "glibc-&glibc-linuxthreads-version;-localedef_segfault-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">
@@ -94,9 +90,6 @@
 
 <!ENTITY elftoaout-fixes-patch "elftoaout-&elftoaout-version;-64bit_fixes-1.patch">
 
-<!ENTITY glibc-sparc_tls-patch "glibc-&glibc-version;-sparc_tls-1.patch">
-<!ENTITY glibc-sparc_gcc4_fixes-patch "glibc-&glibc-linuxthreads-version;-sparc_gcc4_fixes-1.patch">
-
 <!ENTITY linux-libc-headers-sparc_biarch-patch "linux-libc-headers-&linux-libc-headers-version;-sparc_biarch-1.patch">
 <!ENTITY linux-libc-headers-sparc_conflicts-patch "linux-libc-headers-&linux-libc-headers-version;-sparc_conflicts-1.patch">
 
@@ -119,8 +112,6 @@
 <!ENTITY gcc-mips_pure64-patch "gcc-&gcc-version;-mips_pure64-1.patch">
 <!ENTITY gcc-mips_tls-patch "gcc-&gcc-version;-mips_tls-1.patch">
 
-<!ENTITY glibc-mips_nptl-patch "glibc-&glibc-version;-mips_nptl-1.patch">
-
 <!ENTITY grep-mips_update-patch "grep-&grep-version;-mips_config_update-1.patch">
 
 <!ENTITY lfs-bootscripts-raq2-patch "lfs-bootscripts-raq2-8.patch">
@@ -140,4 +131,3 @@
 <!-- Start of Alpha patches -->
 
 <!ENTITY aboot-alpha-patch "aboot-&aboot-version;-kernel26_gcc4_fixes-2.patch">
-

Deleted: trunk/BOOK/sparcv8-index.xml
===================================================================
--- trunk/BOOK/sparcv8-index.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/sparcv8-index.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book 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;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/sparcv8/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/sparcv8-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/sparcv8-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/sparcv8-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the LFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparcv8-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>

Modified: trunk/BOOK/stylesheets/top-index.xsl
===================================================================
--- trunk/BOOK/stylesheets/top-index.xsl	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/stylesheets/top-index.xsl	2006-04-12 23:38:31 UTC (rev 1362)
@@ -131,15 +131,8 @@
           </li>
           <li>
             <h4>
-              <a href="sparcv8">
-                <xsl:text>Sparc v8</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
               <a href="sparc">
-                <xsl:text>Sparc v9 and above</xsl:text>
+                <xsl:text>Sparc v8 and above</xsl:text>
               </a>
             </h4>
           </li>

Deleted: trunk/BOOK/temp-system/sparcv8-chapter.xml
===================================================================
--- trunk/BOOK/temp-system/sparcv8-chapter.xml	2006-04-12 19:39:40 UTC (rev 1361)
+++ trunk/BOOK/temp-system/sparcv8-chapter.xml	2006-04-12 23:38:31 UTC (rev 1362)
@@ -1,35 +0,0 @@
-<?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-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <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/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>




More information about the cross-lfs mailing list