r6749 - in branches/cross-lfs/BOOK: . cross-tools/sparc cross-tools/sparc64 cross-tools/sparc64-64 cross-tools/x86_64 final-system/mips 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

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Tue Aug 23 13:49:30 PDT 2005


Author: manuel
Date: 2005-08-23 14:49:27 -0600 (Tue, 23 Aug 2005)
New Revision: 6749

Modified:
   branches/cross-lfs/BOOK/cross-tools/sparc/linux-libc-headers.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64-64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/cross-tools/x86_64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/mips/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/ppc/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/sparc64-64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/x86/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/x86_64-64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/final-system/x86_64/linux-libc-headers.xml
   branches/cross-lfs/BOOK/general.ent
Log:
Xinclude redo on linux-libc-headers files.

Modified: branches/cross-lfs/BOOK/cross-tools/sparc/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc/linux-libc-headers.xml	2005-08-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/cross-tools/sparc/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -43,9 +43,9 @@
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
-    <para>The following patch fixes build issues with Silo and other programs:</para>
+    <para os="ca">The following patch fixes build issues with Silo and other programs:</para>
 
-<screen><userinput>patch -Np1 -i ../&linux-libc-headers-sparc_conflicts-patch;</userinput></screen>
+<screen os="cb"><userinput>patch -Np1 -i ../&linux-libc-headers-sparc_conflicts-patch;</userinput></screen>
 
     <para>Install the header files:</para>
 

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64/linux-libc-headers.xml	2005-08-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -43,14 +43,21 @@
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
-    <para>The following patch contains header stubs which link to the
-    proper header from either asm-sparc or asm-sparc64:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc64/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
-<screen><userinput>patch -Np1 -i ../&linux-libc-headers-sparc_biarch-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc64/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
-    <para>The following patch fixes build issues with Silo and other programs:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-<screen><userinput>patch -Np1 -i ../&linux-libc-headers-sparc_conflicts-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <para>Install the header files:</para>
 

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64-64/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64-64/linux-libc-headers.xml	2005-08-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64-64/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -43,9 +43,13 @@
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
-    <para>The following patch fixes build issues with Silo and other programs:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-<screen><userinput>patch -Np1 -i ../&linux-libc-headers-sparc_conflicts-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <para>Install the header files:</para>
 

Modified: branches/cross-lfs/BOOK/cross-tools/x86_64/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86_64/linux-libc-headers.xml	2005-08-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/cross-tools/x86_64/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -43,10 +43,13 @@
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
-    <para>The following patch contains header stubs which link to the
-    proper header from either asm-i386 or asm-x86_64:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86_64/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen><userinput>patch -Np1 -i ../&linux-libc-headers-x86_64_biarch-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86_64/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <para>Install the header files:</para>
 

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-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/final-system/mips/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -16,26 +16,59 @@
     <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('package-linux-libc-headers'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/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="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(id('install-linux-libc-headers')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Install the header files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>cp -R include/asm-mips /usr/include/asm
 cp -R include/linux /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(id('install-linux-libc-headers')/para[3]/range-to(id('install-linux-libc-headers')/para[last()]))"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
   </sect2>
 
   <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-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/final-system/ppc/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -16,27 +16,59 @@
     <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('package-linux-libc-headers'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/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="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(id('install-linux-libc-headers')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Install the header files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>cp -R include/asm-ppc /usr/include/asm
 cp -R include/linux /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(id('install-linux-libc-headers')/para[3]/range-to(id('install-linux-libc-headers')/para[last()]))"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
   </sect2>
 
   <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-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -16,26 +16,59 @@
     <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('package-linux-libc-headers'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/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="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(id('install-linux-libc-headers')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Install the header files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>cp -R include/asm-sparc /usr/include/asm
 cp -R include/linux /usr/include</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(id('install-linux-libc-headers')/para[3]/range-to(id('install-linux-libc-headers')/para[last()]))"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

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-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -16,25 +16,44 @@
     <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('package-linux-libc-headers'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/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="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(id('install-linux-libc-headers')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Install the header files:</para>
-
-    <para>The following patch contains header stubs which link to the
+    <para os="ba">The following patch contains header stubs which link to the
     proper header from either asm-sparc or asm-sparc64:</para>
 
-<screen><userinput>patch -Np1 -i ../&linux-libc-headers-sparc_biarch-patch;</userinput></screen>
+<screen os="bb"><userinput>patch -Np1 -i ../&linux-libc-headers-sparc_biarch-patch;</userinput></screen>
 
-    <para>Install the header files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>install -d /usr/include
 cp -R include/asm-sparc64 /usr/include/
@@ -42,17 +61,19 @@
 cp -R include/asm-sparc-biarch /usr/include/asm
 cp -R include/linux /usr/include</userinput></screen>
 
-    <para>Ensure that all the headers are owned by
-    <systemitem class="username">root</systemitem>:</para>
+    <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>
 
-    <para>Make sure the users can read the headers:</para>
+    <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>
 
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

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-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/final-system/sparc64-64/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -16,36 +16,60 @@
     <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/linux-libc-headers.xml"
-  xpointer="xpointer(id('package-linux-libc-headers'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/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="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(id('install-linux-libc-headers')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Install the header files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Install the header files:</para>
-
 <screen><userinput>install -d /usr/include
 cp -R include/asm-sparc64 /usr/include/asm
 cp -R include/linux /usr/include</userinput></screen>
 
-    <para>Ensure that all the headers are owned by
-    <systemitem class="username">root</systemitem>:</para>
+    <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,linux}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Make sure the users can read the headers:</para>
+    <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,linux} -type d -exec chmod 755 {} \;
-find /usr/include/{asm,linux} -type f -exec chmod 644 {} \;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

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-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/final-system/x86/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -45,7 +45,7 @@
   <sect2 id="install-linux-libc-headers" role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
-    <para>For years it has been common practice to use <quote>raw</quote>
+    <para os="a">For years it has been common practice to use <quote>raw</quote>
     kernel headers (straight from a kernel tarball) in <filename
     class="directory">/usr/include</filename>, but over the last few
     years, the kernel developers have taken a strong stance that this
@@ -53,23 +53,21 @@
     which was designed to maintain an API stable version of the Linux
     headers.</para>
 
-    <para>Install the header files:</para>
+    <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>
 
-    <para>Ensure that all the headers are owned by
+    <para os="c">Ensure that all the headers are owned by
     <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>chown -R root:root /usr/include/{asm,linux}</userinput></screen>
+<screen os="d"><userinput>chown -R root:root /usr/include/{asm,linux}</userinput></screen>
 
-    <para>Make sure the users can read the headers:</para>
+    <para os="e">Make sure the users can read the headers:</para>
 
-<screen><userinput>find /usr/include/{asm,linux} -type d -exec chmod 755 {} \;
+<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>
 
-    <para/>
-
   </sect2>
 
   <sect2 id="contents-linux-libc-headers" role="content">

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-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/final-system/x86_64/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -16,11 +16,12 @@
     <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
   </indexterm>
 
-  <sect2 id="package-linux-libc-headers" role="package">
+  <sect2 role="package">
     <title/>
 
-    <para>The Linux-Libc-Headers package contains the
-    <quote>sanitized</quote> kernel headers.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -32,33 +33,27 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Coreutils</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
   <sect2 id="install-linux-libc-headers" role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
-    <para>For years it has been common practice to use <quote>raw</quote>
-    kernel headers (straight from a kernel tarball) in <filename
-    class="directory">/usr/include</filename>, but over the last few
-    years, the kernel developers have taken a strong stance that this
-    should not be done. This gave birth to the Linux-Libc-Headers Project,
-    which was designed to maintain an API stable version of the Linux
-    headers.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>The following patch contains header stubs which link to the
+    <para os="aa">The following patch contains header stubs which link to the
     proper header from either asm-i386 or asm-x86_64:</para>
 
-<screen><userinput>patch -Np1 -i ../&linux-libc-headers-x86_64_biarch-patch;</userinput></screen>
+<screen os="ab"><userinput>patch -Np1 -i ../&linux-libc-headers-x86_64_biarch-patch;</userinput></screen>
 
-    <para>Install the header files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>install -d /usr/include
 cp -R include/asm-i386 /usr/include/
@@ -66,50 +61,23 @@
 cp -R include/asm-x86_64-biarch /usr/include/asm
 cp -R include/linux /usr/include</userinput></screen>
 
-    <para>Ensure that all the headers are owned by
-    <systemitem class="username">root</systemitem>:</para>
+    <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>
 
-    <para>Make sure the users can read the headers:</para>
+    <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>
 
-    <para/>
-
   </sect2>
 
-  <sect2 id="contents-linux-libc-headers" role="content">
-    <title>Contents of Linux-Libc-Headers</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed headers</segtitle>
-
-      <seglistitem>
-        <seg>/usr/include/{asm,linux}/*.h</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="linux-libc-headers">
-        <term><filename
-        class="headerfile">/usr/include/{asm,linux}/*.h</filename></term>
-        <listitem>
-          <para>The Linux headers API</para>
-          <indexterm zone="ch-system-linux-libc-headers linux-libc-headers">
-            <primary
-            sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

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-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/final-system/x86_64-64/linux-libc-headers.xml	2005-08-23 20:49:27 UTC (rev 6749)
@@ -19,8 +19,9 @@
   <sect2 id="package-linux-libc-headers" role="package">
     <title/>
 
-    <para>The Linux-Libc-Headers package contains the
-    <quote>sanitized</quote> kernel headers.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -32,77 +33,47 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(id('package-linux-libc-headers')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Coreutils</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
   <sect2 id="install-linux-libc-headers" role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
-    <para>For years it has been common practice to use <quote>raw</quote>
-    kernel headers (straight from a kernel tarball) in <filename
-    class="directory">/usr/include</filename>, but over the last few
-    years, the kernel developers have taken a strong stance that this
-    should not be done. This gave birth to the Linux-Libc-Headers Project,
-    which was designed to maintain an API stable version of the Linux
-    headers.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Install the header files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>install -d /usr/include
 cp -R include/asm-x86_64 /usr/include/asm
 cp -R include/linux /usr/include</userinput></screen>
 
-    <para>Ensure that all the headers are owned by
-    <systemitem class="username">root</systemitem>:</para>
+    <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,linux}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Make sure the users can read the headers:</para>
+    <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,linux} -type d -exec chmod 755 {} \;
-find /usr/include/{asm,linux} -type f -exec chmod 644 {} \;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para/>
-
   </sect2>
 
-  <sect2 id="contents-linux-libc-headers" role="content">
-    <title>Contents of Linux-Libc-Headers</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed headers</segtitle>
-
-      <seglistitem>
-        <seg>/usr/include/{asm,linux}/*.h</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="linux-libc-headers">
-        <term><filename
-        class="headerfile">/usr/include/{asm,linux}/*.h</filename></term>
-        <listitem>
-          <para>The Linux headers API</para>
-          <indexterm zone="ch-system-linux-libc-headers linux-libc-headers">
-            <primary
-            sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-08-23 20:18:17 UTC (rev 6748)
+++ branches/cross-lfs/BOOK/general.ent	2005-08-23 20:49:27 UTC (rev 6749)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-cross-lfs-20050822">
+<!ENTITY version "7.0-cross-lfs-20050823">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64">
 <!ENTITY version-ppc "&version;-PowerPC">
@@ -8,7 +8,7 @@
 <!ENTITY version-mips "&version;-MIPS">
 <!ENTITY version-mips64 "&version;-MIPS64">
 
-<!ENTITY releasedate "August 22, 2005">
+<!ENTITY releasedate "August 23, 2005">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 




More information about the lfs-book mailing list