r1373 - / trunk/BOOK trunk/BOOK/cross-tools trunk/BOOK/cross-tools/64 trunk/BOOK/cross-tools/common trunk/BOOK/cross-tools/mips trunk/BOOK/cross-tools/mips64 trunk/BOOK/cross-tools/mips64-64 trunk/BOOK/cross-tools/multilib trunk/BOOK/cross-tools/ppc trunk/BOOK/cross-tools/sparc64 trunk/BOOK/cross-tools/sparc64-64 trunk/BOOK/final-system/mips trunk/BOOK/final-system/mips64 trunk/BOOK/final-system/sparc64-64 trunk/BOOK/final-system/x86_64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu Apr 13 10:33:49 PDT 2006


Author: jim
Date: 2006-04-13 11:33:46 -0600 (Thu, 13 Apr 2006)
New Revision: 1373

Removed:
   trunk/BOOK/cross-tools/sparc64/glibc.xml
Modified:
   /
   trunk/BOOK/
   trunk/BOOK/cross-tools/64/glibc.xml
   trunk/BOOK/cross-tools/common/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/multilib/glibc-64bit.xml
   trunk/BOOK/cross-tools/multilib/glibc.xml
   trunk/BOOK/cross-tools/ppc/glibc.xml
   trunk/BOOK/cross-tools/sparc64-64/glibc.xml
   trunk/BOOK/cross-tools/sparc64-chapter.xml
   trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml
   trunk/BOOK/final-system/mips/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/sparc64-64/glibc.xml
   trunk/BOOK/final-system/x86_64-64/glibc.xml
Log:
 r2862 at server (orig r1371):  jim | 2006-04-13 10:30:15 -0700
  r2860 at server:  jim | 2006-04-13 10:29:47 -0700
  Fixed look of glibc, moved sed after patches
 



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


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:2859
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:2860
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/cross-tools/64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/64/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/64/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -36,19 +36,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/common/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/common/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/common/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -30,12 +30,6 @@
 
 <screen os="dc"><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
 
-    <para os="s1">The following sed fixes a build issue with Glibc, this will prevent nscd from trying
-to link to libraries, that don't exist:</para>
-
-<screen os="s2"><userinput>cp nscd/Makefile{,.orig}
-sed -e "/nscd_stat.o: sysincludes = # nothing/d" nscd/Makefile.orig > nscd/Makefile</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -44,6 +38,12 @@
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
+    <para os="s1">The following sed fixes a build issue with Glibc, this will prevent nscd from trying
+to link to libraries, that don't exist:</para>
+
+<screen os="s2"><userinput>cp nscd/Makefile{,.orig}
+sed -e "/nscd_stat.o: sysincludes = # nothing/d" nscd/Makefile.orig > nscd/Makefile</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>

Modified: trunk/BOOK/cross-tools/mips/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/mips/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/mips/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -60,6 +60,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/glibc-64bit.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/mips64/glibc-64bit.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -51,6 +51,14 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <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"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
@@ -60,14 +68,6 @@
 
     <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"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <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/cross-tools/mips64/glibc-n32.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/glibc-n32.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/mips64/glibc-n32.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -51,6 +51,14 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <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"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
@@ -60,14 +68,6 @@
 
     <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"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <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/cross-tools/mips64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/mips64/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -52,19 +52,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <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-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/mips64-64/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -60,6 +60,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- trunk/BOOK/cross-tools/multilib/glibc-64bit.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/multilib/glibc-64bit.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -35,11 +35,19 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <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="../common/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/multilib/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/multilib/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/multilib/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -35,6 +35,14 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 

Modified: trunk/BOOK/cross-tools/ppc/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/ppc/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -36,19 +36,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -35,6 +35,14 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
     <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"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
@@ -44,14 +52,6 @@
 
     <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"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <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"

Deleted: trunk/BOOK/cross-tools/sparc64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/sparc64/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -1,119 +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">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    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="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <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="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64-64/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/sparc64-64/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -44,6 +44,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/sparc64-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64-chapter.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/cross-tools/sparc64-chapter.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -18,7 +18,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc-final.xml"/>
 

Modified: trunk/BOOK/final-system/mips/glibc.xml
===================================================================
--- trunk/BOOK/final-system/mips/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/final-system/mips/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -48,6 +48,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- trunk/BOOK/final-system/mips64/glibc-64bit.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/final-system/mips64/glibc-64bit.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -51,6 +51,14 @@
 
     <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/mips64/glibc-n32.xml
===================================================================
--- trunk/BOOK/final-system/mips64/glibc-n32.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/final-system/mips64/glibc-n32.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -51,6 +51,14 @@
 
     <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/mips64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/mips64/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/final-system/mips64/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -56,6 +56,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/final-system/sparc64-64/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -39,6 +39,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/glibc.xml	2006-04-13 17:33:31 UTC (rev 1372)
+++ trunk/BOOK/final-system/x86_64-64/glibc.xml	2006-04-13 17:33:46 UTC (rev 1373)
@@ -39,6 +39,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"




More information about the cross-lfs mailing list