[lfs-fr] r6609 - in trunk/clfs: . chroot cross-tools cross-tools/x86 cross-tools/x86_64 temp-system temp-system/common temp-system/multilib testsuite-tools/common the-end

myou72 at orange.fr myou72 at orange.fr
Ven 24 Oct 04:23:36 PDT 2014


Author: myou72
Date: 2014-10-24 13:23:35 +0200 (Fri, 24 Oct 2014)
New Revision: 6609

Modified:
   trunk/clfs/chroot/x86_64-64-chapter.xml
   trunk/clfs/chroot/x86_64-chapter.xml
   trunk/clfs/cross-tools/x86-chapter.xml
   trunk/clfs/cross-tools/x86/linux-headers.xml
   trunk/clfs/cross-tools/x86_64-64-chapter.xml
   trunk/clfs/cross-tools/x86_64-chapter.xml
   trunk/clfs/cross-tools/x86_64/linux-headers.xml
   trunk/clfs/maj
   trunk/clfs/temp-system/common/xz.xml
   trunk/clfs/temp-system/common/zlib.xml
   trunk/clfs/temp-system/multilib/binutils.xml
   trunk/clfs/temp-system/multilib/bzip2.xml
   trunk/clfs/temp-system/multilib/check.xml
   trunk/clfs/temp-system/multilib/choose.xml
   trunk/clfs/temp-system/multilib/cloog.xml
   trunk/clfs/temp-system/multilib/file.xml
   trunk/clfs/temp-system/multilib/flex.xml
   trunk/clfs/temp-system/multilib/gcc.xml
   trunk/clfs/temp-system/multilib/gmp.xml
   trunk/clfs/temp-system/multilib/mpc.xml
   trunk/clfs/temp-system/multilib/mpfr.xml
   trunk/clfs/temp-system/multilib/ncurses.xml
   trunk/clfs/temp-system/multilib/xz.xml
   trunk/clfs/temp-system/multilib/zlib.xml
   trunk/clfs/temp-system/x86-chapter.xml
   trunk/clfs/temp-system/x86_64-64-chapter.xml
   trunk/clfs/temp-system/x86_64-chapter.xml
   trunk/clfs/testsuite-tools/common/introduction.xml
   trunk/clfs/the-end/downloadclient.xml
   trunk/clfs/the-end/reboot.xml
   trunk/clfs/users_groups.ent
   trunk/clfs/x86-index.xml
   trunk/clfs/x86_64-64-index.xml
   trunk/clfs/x86_64-index.xml
Log:
suite maj

Modified: trunk/clfs/chroot/x86_64-64-chapter.xml
===================================================================
--- trunk/clfs/chroot/x86_64-64-chapter.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/chroot/x86_64-64-chapter.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,7 +12,6 @@
   <title>Si vous allez vous chrooter</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
@@ -20,6 +19,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
 
 </chapter>

Modified: trunk/clfs/chroot/x86_64-chapter.xml
===================================================================
--- trunk/clfs/chroot/x86_64-chapter.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/chroot/x86_64-chapter.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,7 +12,6 @@
   <title>Si vous allez vous chrooter</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
@@ -20,6 +19,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
 
 </chapter>

Modified: trunk/clfs/cross-tools/x86/linux-headers.xml
===================================================================
--- trunk/clfs/cross-tools/x86/linux-headers.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/cross-tools/x86/linux-headers.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -8,10 +8,10 @@
 <sect1 id="ch-cross-tools-linux-headers" role="wrap">
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;</title>
+  <title>Entête de Linux-&linux-version;</title>
 
   <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <primary sortas="a-Linux-Headers">Entête de Linux</primary>
     <secondary>outils croisés</secondary>
   </indexterm>
 
@@ -20,13 +20,22 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de Linux-Headers</title>
+    <title>Installation des entêtes de Linux</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/linux-headers.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+
     href="../../final-system/common/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 

Modified: trunk/clfs/cross-tools/x86-chapter.xml
===================================================================
--- trunk/clfs/cross-tools/x86-chapter.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/cross-tools/x86-chapter.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,20 +12,18 @@
   <title>Construction des outils de compilation croisée</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/clfs/cross-tools/x86_64/linux-headers.xml
===================================================================
--- trunk/clfs/cross-tools/x86_64/linux-headers.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/cross-tools/x86_64/linux-headers.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -8,10 +8,10 @@
 <sect1 id="ch-cross-tools-linux-headers" role="wrap">
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;</title>
+  <title>Entête de Linux-&linux-version;</title>
 
   <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <primary sortas="a-Linux-Headers">Entête de Linux</primary>
     <secondary>outils croisés</secondary>
   </indexterm>
 
@@ -20,13 +20,21 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de Linux-Headers</title>
+    <title>Installation des entêtes de Linux</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/linux-headers.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 

Modified: trunk/clfs/cross-tools/x86_64-64-chapter.xml
===================================================================
--- trunk/clfs/cross-tools/x86_64-64-chapter.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/cross-tools/x86_64-64-chapter.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,21 +12,18 @@
   <title>Construction des outils de compilation croisée</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/clfs/cross-tools/x86_64-chapter.xml
===================================================================
--- trunk/clfs/cross-tools/x86_64-chapter.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/cross-tools/x86_64-chapter.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,22 +12,19 @@
   <title>Construction des outils de compilation croisée</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eglibc-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/clfs/maj
===================================================================
--- trunk/clfs/maj	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/maj	2014-10-24 11:23:35 UTC (rev 6609)
@@ -1,1009 +1,3 @@
-diff -ru /home/jp/a/BOOK/temp-system/common/xz.xml BOOK/temp-system/common/xz.xml
---- /home/jp/a/BOOK/temp-system/common/xz.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/common/xz.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -11,7 +11,7 @@
-   <title>XZ Utils-&xz-version;</title>
- 
-   <indexterm zone="ch-temp-system-xz">
--    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
-+    <primary sortas="a-XZ Utils">XZ Utils</primary>
-     <secondary>temporary system</secondary>
-   </indexterm>
- 
-@@ -20,7 +20,7 @@
-   xpointer="xpointer(//*[@role='package'])"/>
- 
-   <sect2 role="installation">
--    <title>Installation of XZ-Utils</title>
-+    <title>Installation of XZ Utils</title>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/xz.xml"
-diff -ru /home/jp/a/BOOK/temp-system/common/zlib.xml BOOK/temp-system/common/zlib.xml
---- /home/jp/a/BOOK/temp-system/common/zlib.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/common/zlib.xml	2014-10-03 20:44:43.932339262 +0200
-@@ -12,7 +12,7 @@
- 
-   <indexterm zone="ch-temp-system-zlib">
-     <primary sortas="a-Zlib">Zlib</primary>
--    <secondary>boot</secondary>
-+    <secondary>temporary system</secondary>
-   </indexterm>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -22,6 +22,10 @@
-   <sect2 role="installation">
-     <title>Installation of Zlib</title>
- 
-+    <para os="h">Several packages in the temporary system use Zlib,
-+    including Binutils, GCC, and Util-linux, so we will add it to
-+    <filename class="directory">/tools</filename>.</para>
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/zlib.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
-@@ -40,7 +44,9 @@
-     href="../../final-system/common/zlib.xml"
-     xpointer="xpointer(//*[@os='f'])"/>
- 
--<screen os="g"><userinput>make install</userinput></screen>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../../final-system/common/zlib.xml"
-+    xpointer="xpointer(//*[@os='g'])"/>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/temp-system/multilib/binutils.xml BOOK/temp-system/multilib/binutils.xml
---- /home/jp/a/BOOK/temp-system/multilib/binutils.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/binutils.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -43,22 +43,14 @@
-     href="../common/binutils.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
--<screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-dir;/configure \
-+<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
-     --prefix=/tools --libdir=/tools/lib64 --with-lib-path=/tools/lib64:/tools/lib \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-     --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
- 
--    <variablelist os="ea">
--      <title>The meaning of the new configure options:</title>
--
--      <varlistentry>
--        <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
--        <listitem>
--          <para>Tells the compiler to use our 64-bit build flags.</para>
--        </listitem>
--      </varlistentry>
--
--    </variablelist>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/binutils.xml"
-+    xpointer="xpointer(//*[@os='k'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/binutils.xml"
-diff -ru /home/jp/a/BOOK/chroot/x86_64-64-chapter.xml BOOK/chroot/x86_64-64-chapter.xml
---- /home/jp/a/BOOK/chroot/x86_64-64-chapter.xml	2014-05-11 16:24:52.622516679 +0200
-+++ BOOK/chroot/x86_64-64-chapter.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -12,7 +12,6 @@
-   <title>If You Are Going to Chroot</title>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-@@ -20,6 +19,5 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
- 
- </chapter>
-diff -ru /home/jp/a/BOOK/temp-system/multilib/bzip2.xml BOOK/temp-system/multilib/bzip2.xml
---- /home/jp/a/BOOK/temp-system/multilib/bzip2.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/bzip2.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -23,7 +23,7 @@
-     <title>Installation of Bzip2</title>
- 
-     <para os="m1">Bzip2's default Makefile target automatically runs the
--    testsuite as well. We need to remove the tests since they won't work on
-+    test suite as well. We need to remove the tests since they won't work on
-     a multi-architecture build, and change the default lib path
-     to <filename class="directory">lib64</filename>:</para>
- 
-@@ -36,7 +36,7 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../64/bzip2.xml"
-+    href="../common/bzip2.xml"
-     xpointer="xpointer(//*[@os='cc'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/temp-system/multilib/check.xml BOOK/temp-system/multilib/check.xml
---- /home/jp/a/BOOK/temp-system/multilib/check.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/check.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -5,12 +5,12 @@
-   %general-entities;
- ]>
- 
--<sect1 id="ch-testsuite-tools-check" role="wrap">
-+<sect1 id="ch-temp-system-check" role="wrap">
-   <?dbhtml filename="check.html"?>
- 
-   <title>Check-&check-version;</title>
- 
--  <indexterm zone="ch-testsuite-tools-check">
-+  <indexterm zone="ch-temp-system-check">
-     <primary sortas="a-Check">Check</primary>
-   </indexterm>
- 
-@@ -23,9 +23,13 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/check.xml"
-+    xpointer="xpointer(//*[@os='a'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/check.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
- 
--<screen os="d"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
-+<screen os="d"><userinput>./configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/temp-system/multilib/choose.xml BOOK/temp-system/multilib/choose.xml
---- /home/jp/a/BOOK/temp-system/multilib/choose.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/temp-system/multilib/choose.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -22,28 +22,23 @@
-     href="../common/choose.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
- 
--<screen ><userinput>/tools/lib/libc.so.6
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/choose.xml"
-+    xpointer="xpointer(//*[@os='d'])"/>
-+
-+<screen os="e"><userinput>/tools/lib/libc.so.6
- /tools/lib64/libc.so.6
- /tools/bin/gcc -v</userinput></screen>
- 
--  <para os="d">If any of these commands fail, you will have to follow the boot
-+  <para os="f">If any of these commands fail, you will have to follow the boot
-   method.</para>
- 
--  <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
--  (having been compiled with GCC-4.1.2 or greater). The reason for the
--  kernel version requirement is that eglibc is built to generate the library
--  for the smallest version of the Linux kernel expected to be supported.</para>
--
--  <para>To check your kernel version, run <command>cat /proc/version</command>
--  - if it does not say that you are running a 2.6.32 or later Linux kernel,
--  compiled with GCC 4.1.2 or later, you cannot chroot.</para>
--
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/choose.xml"
--    xpointer="xpointer(//*[@os='e'])"/>
-+    xpointer="xpointer(//*[@os='g'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/choose.xml"
--    xpointer="xpointer(//*[@os='f'])"/>
-+    xpointer="xpointer(//*[@os='h'])"/>
- 
- </sect1>
-diff -ru /home/jp/a/BOOK/temp-system/multilib/cloog.xml BOOK/temp-system/multilib/cloog.xml
---- /home/jp/a/BOOK/temp-system/multilib/cloog.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/cloog.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -26,16 +26,20 @@
-     href="../common/cloog.xml"
- 	xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-+<screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64 \
--     --enable-shared --with-gmp-prefix=/tools --with-isl-prefix=/tools</userinput></screen>
-+     --with-isl=system</userinput></screen>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/cloog.xml"
-+    xpointer="xpointer(//*[@os='b1'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/cloog.xml"
-     xpointer="xpointer(//*[@os='s1'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../../final-system/common/cloog.xml"
-+    href="../common/cloog.xml"
-     xpointer="xpointer(//*[@os='s2'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -45,7 +49,7 @@
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/cloog.xml"
-     xpointer="xpointer(//*[@os='d'])"/>
--        
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/cloog.xml"
-     xpointer="xpointer(//*[@os='e'])"/>
-diff -ru /home/jp/a/BOOK/temp-system/multilib/file.xml BOOK/temp-system/multilib/file.xml
---- /home/jp/a/BOOK/temp-system/multilib/file.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/file.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -26,7 +26,7 @@
-     href="../common/file.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-+<screen os="b"><userinput>./configure --prefix=/tools \
-    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/temp-system/multilib/flex.xml BOOK/temp-system/multilib/flex.xml
---- /home/jp/a/BOOK/temp-system/multilib/flex.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/flex.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -34,7 +34,7 @@
-     href="../../final-system/common/flex.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="cb"><userinput>CC="${CC} ${BUILD64}" M4=m4 ./configure --prefix=/tools \
-+<screen os="cb"><userinput>M4=m4 ./configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-     --cache-file=config.cache</userinput></screen>
- 
-diff -ru /home/jp/a/BOOK/temp-system/multilib/gcc.xml BOOK/temp-system/multilib/gcc.xml
---- /home/jp/a/BOOK/temp-system/multilib/gcc.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/gcc.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -51,7 +51,7 @@
-     xpointer="xpointer(//*[@os='fix1'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../../final-system/common/gcc.xml"
-+    href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='fix2'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -70,34 +70,16 @@
-     href="../../final-system/common/gcc.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
--  ../gcc-&gcc-version;/configure --prefix=/tools \
--  --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--  --target=${CLFS_TARGET} --libexecdir=/tools/lib64 --with-local-prefix=/tools \
--  --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
--  --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
--  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-gmp=/tools \
--  --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
--  --disable-isl-version-check --with-cloog=/tools --with-system-zlib \
--  --with-native-system-header-dir=/tools/include --disable-libssp \
--  --disable-install-libiberty  --enable-libstdcxx-time \
--  --enable-checking=release</userinput></screen>
--
--    <variablelist os="dd">
--      <title>The meaning of the new configure options:</title>
--
--      <varlistentry os="dd1">
--        <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
--        <listitem>
--          <para>This forces the C++ compiler to use our 64 Bit flags.</para>
--        </listitem>
--      </varlistentry>
--
--      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--      href="../common/gcc.xml"
--      xpointer="xpointer(//*[@os='cl1'])"/>
-+<screen os="dc"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-+    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-+    --target=${CLFS_TARGET} --with-local-prefix=/tools --disable-nls \
-+    --enable-languages=c,c++ --disable-libstdcxx-pch \
-+    --with-system-zlib --with-native-system-header-dir=/tools/include \
-+    --disable-libssp --enable-libstdcxx-time --enable-checking=release</userinput></screen>
- 
--    </variablelist>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='cl'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gcc.xml"
-@@ -123,6 +105,14 @@
-     href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='cp'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='u'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='cr'])"/>
-+
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/temp-system/multilib/gmp.xml BOOK/temp-system/multilib/gmp.xml
---- /home/jp/a/BOOK/temp-system/multilib/gmp.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/gmp.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -36,19 +36,22 @@
-     href="../common/gmp.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>HOST_CC=gcc CC="${CC} \
--    ${BUILD64}" CXX="${CXX} ${BUILD64}" ./configure --prefix=/tools \
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gmp.xml"
-+    xpointer="xpointer(//*[@os='b'])"/>
-+
-+<screen os="c"><userinput>CC_FOR_BUILD=gcc ./configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-     --libdir=/tools/lib64 --enable-cxx</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gmp.xml"
--    xpointer="xpointer(//*[@os='c'])"/>
-+    xpointer="xpointer(//*[@os='ca'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gmp.xml"
-     xpointer="xpointer(//*[@os='d'])"/>
--        
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gmp.xml"
-     xpointer="xpointer(//*[@os='e'])"/>
-@@ -57,6 +60,10 @@
-     href="../common/gmp.xml"
-     xpointer="xpointer(//*[@os='f'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gmp.xml"
-+    xpointer="xpointer(//*[@os='g'])"/>
-+
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/temp-system/multilib/isl.xml BOOK/temp-system/multilib/isl.xml
---- /home/jp/a/BOOK/temp-system/multilib/isl.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/isl.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -26,10 +26,9 @@
-     href="../common/isl.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
--  ./configure --prefix=/tools \
-+<screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--    --libdir=/tools/lib64 --with-gmp-prefix=/tools</userinput></screen>
-+    --libdir=/tools/lib64</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/isl.xml"
-@@ -38,7 +37,7 @@
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/isl.xml"
-     xpointer="xpointer(//*[@os='d'])"/>
--        
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/isl.xml"
-     xpointer="xpointer(//*[@os='e'])"/>
-diff -ru /home/jp/a/BOOK/temp-system/multilib/mpc.xml BOOK/temp-system/multilib/mpc.xml
---- /home/jp/a/BOOK/temp-system/multilib/mpc.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/temp-system/multilib/mpc.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -26,8 +26,7 @@
-     href="../common/mpc.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
--  ./configure --prefix=/tools \
-+<screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-     --libdir=/tools/lib64</userinput></screen>
- 
-@@ -38,7 +37,7 @@
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpc.xml"
-     xpointer="xpointer(//*[@os='d'])"/>
--        
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpc.xml"
-     xpointer="xpointer(//*[@os='e'])"/>
-diff -ru /home/jp/a/BOOK/temp-system/multilib/mpfr.xml BOOK/temp-system/multilib/mpfr.xml
---- /home/jp/a/BOOK/temp-system/multilib/mpfr.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/mpfr.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -34,9 +34,9 @@
-     href="../common/mpfr.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-+<screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--    --libdir=/tools/lib64 --enable-shared</userinput></screen>
-+    --libdir=/tools/lib64</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpfr.xml"
-@@ -45,7 +45,7 @@
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpfr.xml"
-     xpointer="xpointer(//*[@os='d'])"/>
--        
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpfr.xml"
-     xpointer="xpointer(//*[@os='e'])"/>
-diff -ru /home/jp/a/BOOK/temp-system/multilib/ncurses.xml BOOK/temp-system/multilib/ncurses.xml
---- /home/jp/a/BOOK/temp-system/multilib/ncurses.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/ncurses.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -24,6 +24,10 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/ncurses.xml"
-+    xpointer="xpointer(//*[@os='h'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/ncurses.xml"
-     xpointer="xpointer(//*[@os='p1'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -34,8 +38,7 @@
-     href="../common/ncurses.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
--   ./configure --prefix=/tools --with-shared \
-+<screen os="b"><userinput>./configure --prefix=/tools --with-shared \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --without-debug --without-ada \
-    --enable-overwrite --with-build-cc=gcc \
-diff -ru /home/jp/a/BOOK/temp-system/multilib/xz.xml BOOK/temp-system/multilib/xz.xml
---- /home/jp/a/BOOK/temp-system/multilib/xz.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/xz.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -11,7 +11,7 @@
-   <title>XZ Utils-&xz-version;</title>
- 
-   <indexterm zone="ch-temp-system-xz">
--    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
-+    <primary sortas="a-XZ Utils">XZ Utils</primary>
-     <secondary>temporary system</secondary>
-   </indexterm>
- 
-@@ -20,13 +20,13 @@
-   xpointer="xpointer(//*[@role='package'])"/>
- 
-   <sect2 role="installation">
--    <title>Installation of XZ-Utils</title>
-+    <title>Installation of XZ Utils</title>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/xz.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-+<screen os="cb"><userinput>./configure --prefix=/tools \
-      --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-      --libdir=/tools/lib64</userinput></screen>
- 
-diff -ru /home/jp/a/BOOK/temp-system/multilib/zlib.xml BOOK/temp-system/multilib/zlib.xml
---- /home/jp/a/BOOK/temp-system/multilib/zlib.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/multilib/zlib.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -12,7 +12,7 @@
- 
-   <indexterm zone="ch-temp-system-zlib">
-     <primary sortas="a-Zlib">Zlib</primary>
--    <secondary>boot</secondary>
-+    <secondary>temporary system</secondary>
-   </indexterm>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -24,10 +24,13 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/zlib.xml"
-+    xpointer="xpointer(//*[@os='h'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/zlib.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
--   ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
-+<screen os="b"><userinput>./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/zlib.xml"
-diff -ru /home/jp/a/BOOK/temp-system/x86_64-64-chapter.xml BOOK/temp-system/x86_64-64-chapter.xml
---- /home/jp/a/BOOK/temp-system/x86_64-64-chapter.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/temp-system/x86_64-64-chapter.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -12,37 +12,35 @@
-   <title>Constructing a Temporary System</title>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/variables.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gmp.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpfr.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpc.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/isl.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/cloog.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/zlib.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/check.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- 
- </chapter>
-diff -ru /home/jp/a/BOOK/temp-system/x86_64-chapter.xml BOOK/temp-system/x86_64-chapter.xml
---- /home/jp/a/BOOK/temp-system/x86_64-chapter.xml	2014-05-11 16:24:52.634516678 +0200
-+++ BOOK/temp-system/x86_64-chapter.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -12,7 +12,7 @@
-   <title>Constructing a Temporary System</title>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/variables.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
-@@ -22,26 +22,24 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/choose.xml"/>
- 
-diff -ru /home/jp/a/BOOK/temp-system/x86-chapter.xml BOOK/temp-system/x86-chapter.xml
---- /home/jp/a/BOOK/temp-system/x86-chapter.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/temp-system/x86-chapter.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -23,24 +23,22 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-diff -ru /home/jp/a/BOOK/testsuite-tools/common/introduction.xml BOOK/testsuite-tools/common/introduction.xml
---- /home/jp/a/BOOK/testsuite-tools/common/introduction.xml	2014-05-11 16:24:52.618516679 +0200
-+++ BOOK/testsuite-tools/common/introduction.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -12,9 +12,9 @@
- 
-   <para>This chapter builds the tools needed by some packages to run the tests
-   that they have. I.e., <command>make check</command>. Tcl, Expect,
--  and DejaGNU are needed for the GCC and Binutils testsuites. Check is needed
--  for KBD tests. Installing four packages for testing purposes may seem
--  excessive, but it is very reassuring, if not essential, to know that the most
--  important tools are working properly.</para>
-+  and DejaGNU are needed for the GCC, Binutils, and Findutils test suites.
-+  Installing three packages for testing purposes may seem excessive, but it is
-+  very reassuring, if not essential, to know that the most important tools are
-+  working properly.</para>
- 
- </sect1>
-diff -ru /home/jp/a/BOOK/the-end/downloadclient.xml BOOK/the-end/downloadclient.xml
---- /home/jp/a/BOOK/the-end/downloadclient.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/the-end/downloadclient.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -57,12 +57,12 @@
- gawk 'BEGIN {
-   NetService = "/inet/tcp/0/mirror.anl.gov/80"
-   print "GET /pub/gnu/wget/wget-1.14.tar.xz" |& NetService
--  while ((NetService |& getline) > 0)
-+  while ((NetService |& getline) > 0)
-     print $0
-   close(NetService)
--}' > binary
-+}' > binary
- 
--gawk '{q=p;p=$0}NR>1{print q}END{ORS = ""; print p}' binary > wget-1.14.tar.xz 
-+gawk '{q=p;p=$0}NR>1{print q}END{ORS = ""; print p}' binary > wget-1.14.tar.xz
- 
- rm binary
- EOF</userinput></screen>
-@@ -78,7 +78,7 @@
- 
- $response = $http->mirror('http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz', 'wget-1.14.tar.xz');
- die "Failed!\n" unless $response->{success};
--print "Unchanged!\n" if $response->{status} eq '304';      
-+print "Unchanged!\n" if $response->{status} eq '304';
- EOF</userinput></screen>
-       <para>Or use this:</para>
- <screen><userinput>perl -MHTTP::Tiny -E 'say HTTP::Tiny->new->get(shift)->{content}' "http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz" > binary
-diff -ru /home/jp/a/BOOK/the-end/reboot.xml BOOK/the-end/reboot.xml
---- /home/jp/a/BOOK/the-end/reboot.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/the-end/reboot.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -48,7 +48,8 @@
- 
- umount ${CLFS}/dev
- umount ${CLFS}/proc
--umount ${CLFS}/sys</userinput></screen>
-+umount ${CLFS}/sys
-+umount ${CLFS}/run</userinput></screen>
- 
-   <para>Unmount the CLFS file system itself:</para>
- 
-diff -ru /home/jp/a/BOOK/users_groups.ent BOOK/users_groups.ent
---- /home/jp/a/BOOK/users_groups.ent	2014-05-11 16:24:52.622516679 +0200
-+++ BOOK/users_groups.ent	2014-10-03 20:44:43.936339262 +0200
-@@ -7,8 +7,10 @@
- <!ENTITY uid-daemon "2">
- <!ENTITY uid-adm "3">
- <!ENTITY uid-lp "10">
-+<!ENTITY uid-messagebus "27">
- <!ENTITY uid-mail "30">
- <!ENTITY uid-news "31">
-+<!ENTITY uid-systemd-timesync "41">
- <!ENTITY uid-operator "50">
- <!ENTITY uid-postmaster "51">
- <!ENTITY uid-nobody "65534">
-@@ -34,8 +36,11 @@
- <!ENTITY gid-adm "16">
- <!ENTITY gid-console "17">
- <!ENTITY gid-cdrw "18">
-+<!ENTITY gid-messagebus "27">
-+<!ENTITY gid-systemd-journal "28">
- <!ENTITY gid-mail "30">
- <!ENTITY gid-news "31">
-+<!ENTITY gid-wheel "39">
-+<!ENTITY gid-systemd-timesync "41">
- <!ENTITY gid-users "1000">
- <!ENTITY gid-nogroup "65533">
--<!ENTITY gid-nobody "65534">
-diff -ru /home/jp/a/BOOK/x86_64-64-index.xml BOOK/x86_64-64-index.xml
---- /home/jp/a/BOOK/x86_64-64-index.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/x86_64-64-index.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -29,7 +29,7 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-64-chapter.xml"/>
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-64-chapter.xml"/>
- 
-   </part>
- 
-@@ -60,7 +60,7 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86_64-64-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86_64-64-chapter.xml"/>
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/x86_64-64-chapter.xml"/>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86_64-64-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86_64-64-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86_64-64-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-diff -ru /home/jp/a/BOOK/x86_64-index.xml BOOK/x86_64-index.xml
---- /home/jp/a/BOOK/x86_64-index.xml	2014-05-11 16:24:52.622516679 +0200
-+++ BOOK/x86_64-index.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -29,7 +29,7 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-chapter.xml"/>
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-chapter.xml"/>
- 
-   </part>
- 
-@@ -60,7 +60,7 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86_64-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86_64-chapter.xml"/>
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/x86_64-chapter.xml"/>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86_64-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86_64-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86_64-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-diff -ru /home/jp/a/BOOK/x86-index.xml BOOK/x86-index.xml
---- /home/jp/a/BOOK/x86-index.xml	2014-05-11 16:24:52.638516678 +0200
-+++ BOOK/x86-index.xml	2014-10-03 20:44:43.936339262 +0200
-@@ -29,7 +29,7 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86-chapter.xml"/>
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86-chapter.xml"/>
- 
-   </part>
- 
-@@ -60,7 +60,7 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86-chapter.xml"/>
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/x86-chapter.xml"/>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86-chapter.xml"/>
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-diff -ru /home/jp/a/BOOK/cross-tools/x86/linux-headers.xml BOOK/cross-tools/x86/linux-headers.xml
---- /home/jp/a/BOOK/cross-tools/x86/linux-headers.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/x86/linux-headers.xml	2014-10-03 20:44:43.908339261 +0200
-@@ -8,10 +8,10 @@
- <sect1 id="ch-cross-tools-linux-headers" role="wrap">
-   <?dbhtml filename="linux-headers.html"?>
- 
--  <title>Linux-Headers-&linux-version;</title>
-+  <title>Linux-&linux-version2; Headers</title>
- 
-   <indexterm zone="ch-cross-tools-linux-headers">
--    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-+    <primary sortas="a-Linux Headers">Linux Headers</primary>
-     <secondary>cross tools</secondary>
-   </indexterm>
- 
-@@ -20,13 +20,21 @@
-   xpointer="xpointer(//*[@role='package'])"/>
- 
-   <sect2 role="installation">
--    <title>Installation of Linux-Headers</title>
-+    <title>Installation of Linux Headers</title>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/linux-headers.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../../bootable/x86/kernel.xml"
-+    xpointer="xpointer(//*[@os='p1'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../../bootable/x86/kernel.xml"
-+    xpointer="xpointer(//*[@os='p2'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/linux-headers.xml"
-     xpointer="xpointer(//*[@os='b'])"/>
- 
-diff -ru /home/jp/a/BOOK/cross-tools/x86_64/linux-headers.xml BOOK/cross-tools/x86_64/linux-headers.xml
---- /home/jp/a/BOOK/cross-tools/x86_64/linux-headers.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/x86_64/linux-headers.xml	2014-10-03 20:44:43.908339261 +0200
-@@ -8,10 +8,10 @@
- <sect1 id="ch-cross-tools-linux-headers" role="wrap">
-   <?dbhtml filename="linux-headers.html"?>
- 
--  <title>Linux-Headers-&linux-version;</title>
-+  <title>Linux-&linux-version2; Headers</title>
- 
-   <indexterm zone="ch-cross-tools-linux-headers">
--    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-+    <primary sortas="a-Linux Headers">Linux Headers</primary>
-     <secondary>cross tools</secondary>
-   </indexterm>
- 
-@@ -20,13 +20,21 @@
-   xpointer="xpointer(//*[@role='package'])"/>
- 
-   <sect2 role="installation">
--    <title>Installation of Linux-Headers</title>
-+    <title>Installation of Linux Headers</title>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/linux-headers.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../../bootable/x86/kernel.xml"
-+    xpointer="xpointer(//*[@os='p1'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../../bootable/x86/kernel.xml"
-+    xpointer="xpointer(//*[@os='p2'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../final-system/common/linux-headers.xml"
-     xpointer="xpointer(//*[@os='b'])"/>
- 
-diff -ru /home/jp/a/BOOK/cross-tools/x86_64-64-chapter.xml BOOK/cross-tools/x86_64-64-chapter.xml
---- /home/jp/a/BOOK/cross-tools/x86_64-64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/x86_64-64-chapter.xml	2014-10-03 20:44:43.908339261 +0200
-@@ -12,22 +12,19 @@
-   <title>Constructing Cross-Compile Tools</title>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/glibc.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
- 
- </chapter>
-diff -ru /home/jp/a/BOOK/chroot/x86_64-chapter.xml BOOK/chroot/x86_64-chapter.xml
---- /home/jp/a/BOOK/chroot/x86_64-chapter.xml	2014-05-11 16:24:52.618516679 +0200
-+++ BOOK/chroot/x86_64-chapter.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -12,7 +12,6 @@
-   <title>If You Are Going to Chroot</title>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-@@ -20,6 +19,5 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
- 
- </chapter>
-diff -ru /home/jp/a/BOOK/cross-tools/x86_64-chapter.xml BOOK/cross-tools/x86_64-chapter.xml
---- /home/jp/a/BOOK/cross-tools/x86_64-chapter.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/x86_64-chapter.xml	2014-10-03 20:44:43.908339261 +0200
-@@ -12,14 +12,11 @@
-   <title>Constructing Cross-Compile Tools</title>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-@@ -27,8 +24,8 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eglibc-64bit.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc-64bit.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
- 
- </chapter>
-diff -ru /home/jp/a/BOOK/cross-tools/x86-chapter.xml BOOK/cross-tools/x86-chapter.xml
---- /home/jp/a/BOOK/cross-tools/x86-chapter.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/x86-chapter.xml	2014-10-03 20:44:43.908339261 +0200
-@@ -12,21 +12,19 @@
-   <title>Constructing Cross-Compile Tools</title>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/eglibc.xml"/>
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
- 
- </chapter>
 diff -ru /home/jp/a/BOOK/final-system/64/binutils.xml BOOK/final-system/64/binutils.xml
 --- /home/jp/a/BOOK/final-system/64/binutils.xml	2014-05-11 16:24:52.650516678 +0200
 +++ BOOK/final-system/64/binutils.xml	2014-10-03 20:44:43.912339261 +0200

Modified: trunk/clfs/temp-system/common/xz.xml
===================================================================
--- trunk/clfs/temp-system/common/xz.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/common/xz.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -11,7 +11,7 @@
   <title>XZ Utils-&xz-version;</title>
 
   <indexterm zone="ch-temp-system-xz">
-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ-Utils">Utilitaires XZ</primary>
     <secondary>système temporaire</secondary>
   </indexterm>
 
@@ -20,7 +20,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de XZ-Utils</title>
+    <title>Installation des utilitaires XZ</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/xz.xml"
@@ -46,7 +46,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Les détails sur ce paquet sont situés dans <xref
     linkend="contents-xz" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/temp-system/common/zlib.xml
===================================================================
--- trunk/clfs/temp-system/common/zlib.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/common/zlib.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-temp-system-zlib">
     <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>démarrage</secondary>
+    <secondary>Système temporaire</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -22,6 +22,10 @@
   <sect2 role="installation">
     <title>Installation de Zlib</title>
 
+    <para os="h">Quelques paquets dans le système temporaire utilisent Zlib,
+    comme Binutils, GCC, et Util-linux, alors nous l'ajouterons à 
+    <filename class="directory">/tools</filename>.</para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/zlib.xml"
     xpointer="xpointer(//*[@os='a'])"/>
@@ -52,7 +56,9 @@
     href="../../final-system/common/zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/zlib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/clfs/temp-system/multilib/binutils.xml
===================================================================
--- trunk/clfs/temp-system/multilib/binutils.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/binutils.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -44,23 +44,15 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-dir;/configure \
+<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
     --prefix=/tools --libdir=/tools/lib64 --with-lib-path=/tools/lib64:/tools/lib \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
-    <variablelist os="ea">
-      <title>Voici la signification des options de configure :</title>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-      <varlistentry>
-        <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>Dit au compilateur d'utiliser nos drapeaux 64 bits.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='be'])"/>

Modified: trunk/clfs/temp-system/multilib/bzip2.xml
===================================================================
--- trunk/clfs/temp-system/multilib/bzip2.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/bzip2.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -37,7 +37,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='cc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/temp-system/multilib/check.xml
===================================================================
--- trunk/clfs/temp-system/multilib/check.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/check.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -5,12 +5,12 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-testsuite-tools-check" role="wrap">
+<sect1 id="ch-temp-system-check" role="wrap">
   <?dbhtml filename="check.html"?>
 
   <title>Check-&check-version;</title>
 
-  <indexterm zone="ch-testsuite-tools-check">
+  <indexterm zone="ch-temp-system-check">
     <primary sortas="a-Check">Check</primary>
   </indexterm>
 
@@ -23,9 +23,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/check.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/check.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
+<screen os="d"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/temp-system/multilib/choose.xml
===================================================================
--- trunk/clfs/temp-system/multilib/choose.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/choose.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -22,27 +22,23 @@
     href="../common/choose.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen ><userinput>/tools/lib/libc.so.6
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/choose.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>/tools/lib/libc.so.6
 /tools/lib64/libc.so.6
 /tools/bin/gcc -v</userinput></screen>
 
-  <para os="d">Si l'une de ces commandes échoue, vous devrez choisir la méthode du démarrage.</para>
+  <para os="f">Si l'une de ces commandes échoue, vous devrez choisir la méthode du démarrage.</para>
 
-  <para>Pour vous chrooter, vous aurez également besoin d'un noyau Linux 2.6.32 ou supérieur (compilé avec GCC-4.1.2 ou supérieur). La raison expliquant
-  cette exigence de la version du noyau est qu'eglibc est construit pour générer
-  une bibliothèque pour la version du noyau Linux qui devrait être supportée
-  la plus petite.</para>
 
-  <para>Pour vérifier la version de votre noyau, lancez <command>cat /proc/version</command> - si elle ne dit pas que vous exécutez un noyau
-  Linux 2.6.32 ou supérieur compilé avec GCC 4.1.2 ou supérieur, vous ne pouvez pas vous chrooter.</para>
-
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
 </sect1>

Modified: trunk/clfs/temp-system/multilib/cloog.xml
===================================================================
--- trunk/clfs/temp-system/multilib/cloog.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/cloog.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -26,16 +26,20 @@
     href="../common/cloog.xml"
 	xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64 \
-    --enable-shared --with-gmp-prefix=/tools</userinput></screen>
+    --with-isl=system</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/cloog.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/cloog.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/cloog.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/temp-system/multilib/file.xml
===================================================================
--- trunk/clfs/temp-system/multilib/file.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/file.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -26,7 +26,7 @@
     href="../common/file.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/temp-system/multilib/flex.xml
===================================================================
--- trunk/clfs/temp-system/multilib/flex.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/flex.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -34,7 +34,7 @@
     href="../../final-system/common/flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>CC="${CC} ${BUILD64}" M4=m4 ./configure --prefix=/tools \
+<screen os="cb"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 

Modified: trunk/clfs/temp-system/multilib/gcc.xml
===================================================================
--- trunk/clfs/temp-system/multilib/gcc.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/gcc.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -51,7 +51,7 @@
     xpointer="xpointer(//*[@os='fix1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
+    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='fix2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -70,34 +70,17 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-  ../gcc-&gcc-version;/configure --prefix=/tools \
-  --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-  --target=${CLFS_TARGET} --libexecdir=/tools/lib64 --with-local-prefix=/tools \
-  --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
-  --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
-  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-gmp=/tools \
-  --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
-  --disable-isl-version-check --with-cloog=/tools --with-system-zlib \
-  --with-native-system-header-dir=/tools/include --disable-libssp \
-  --disable-install-libiberty  --enable-libstdcxx-time \
-  --enable-checking=release</userinput></screen>
-    <variablelist os="dd">
-      <title>Voici la signification des nouvelles options de configure :</title>
+<screen os="dc"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
+    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} --with-local-prefix=/tools --disable-nls \
+    --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --with-system-zlib --with-native-system-header-dir=/tools/include \
+    --disable-libssp --enable-libstdcxx-time --enable-checking=release</userinput></screen>
 
-      <varlistentry os="dd1">
-        <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>Ceci oblige le compilateur C++ à utiliser nos drapeaux 64 bits.</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cl'])"/>
 
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
@@ -122,6 +105,14 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cp'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cr'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/temp-system/multilib/gmp.xml
===================================================================
--- trunk/clfs/temp-system/multilib/gmp.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/gmp.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -36,14 +36,17 @@
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>HOST_CC=gcc CC="${CC} \
-    ${BUILD64}" CXX="${CXX} ${BUILD64}" ./configure --prefix=/tools \
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen os="c"><userinput>CC_FOR_BUILD=gcc ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir=/tools/lib64 --enable-cxx</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
@@ -57,6 +60,10 @@
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/temp-system/multilib/mpc.xml
===================================================================
--- trunk/clfs/temp-system/multilib/mpc.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/mpc.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -26,8 +26,7 @@
     href="../common/mpc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-  ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir=/tools/lib64</userinput></screen>
 

Modified: trunk/clfs/temp-system/multilib/mpfr.xml
===================================================================
--- trunk/clfs/temp-system/multilib/mpfr.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/mpfr.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -34,9 +34,9 @@
     href="../common/mpfr.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 --enable-shared</userinput></screen>
+    --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpfr.xml"

Modified: trunk/clfs/temp-system/multilib/ncurses.xml
===================================================================
--- trunk/clfs/temp-system/multilib/ncurses.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/ncurses.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -24,6 +24,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -34,8 +38,7 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools --with-shared \
+<screen os="b"><userinput>./configure --prefix=/tools --with-shared \
    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc \

Modified: trunk/clfs/temp-system/multilib/xz.xml
===================================================================
--- trunk/clfs/temp-system/multilib/xz.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/xz.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -11,7 +11,7 @@
   <title>XZ Utils-&xz-version;</title>
 
   <indexterm zone="ch-temp-system-xz">
-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ-Utils">Utilitaires XZ</primary>
     <secondary>système temporaire</secondary>
   </indexterm>
 
@@ -20,13 +20,13 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de XZ-Utils</title>
+    <title>Installation des utilitaires XZ</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="cb"><userinput>./configure --prefix=/tools \
      --build=${CLFS_HOST} --host=${CLFS_TARGET}
      --libdir=/tools/lib64</userinput></screen>
 

Modified: trunk/clfs/temp-system/multilib/zlib.xml
===================================================================
--- trunk/clfs/temp-system/multilib/zlib.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/multilib/zlib.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-temp-system-zlib">
     <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>démarrage</secondary>
+    <secondary>Système temporaire</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -24,10 +24,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/tools --shared --libdir=/tools/lib64</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/tools --shared --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/zlib.xml"

Modified: trunk/clfs/temp-system/x86-chapter.xml
===================================================================
--- trunk/clfs/temp-system/x86-chapter.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/x86-chapter.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -22,24 +22,22 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>

Modified: trunk/clfs/temp-system/x86_64-64-chapter.xml
===================================================================
--- trunk/clfs/temp-system/x86_64-64-chapter.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/x86_64-64-chapter.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,35 +12,35 @@
   <title>Construction d'un système temporaire</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/cloog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
 
 </chapter>

Modified: trunk/clfs/temp-system/x86_64-chapter.xml
===================================================================
--- trunk/clfs/temp-system/x86_64-chapter.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/temp-system/x86_64-chapter.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,7 +12,7 @@
   <title>Construction d'un système temporaire</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
@@ -21,26 +21,24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/choose.xml"/>
 

Modified: trunk/clfs/testsuite-tools/common/introduction.xml
===================================================================
--- trunk/clfs/testsuite-tools/common/introduction.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/testsuite-tools/common/introduction.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -12,9 +12,8 @@
 
   <para>Ce chapitre construit les outils nécessaires à certains paquets pour exécuter les tests que comportent les paquets, par 
   exemple <command>make check</command>. Tcl, Expect
-  et DejaGNU sont nécessaires pour les suites de tests de GCC et de Binutils. 
-  Check est nécessaire pour les tests de KBD.
-  L'installation de quatre paquets pour des tests peut vous sembler excessive, mais c'est très rassurant, sinon essentiel, 
-  de savoir que les outils les plus importants fonctionnent correctement.</para>
+  et DejaGNU sont nécessaires pour les suites de tests de GCC, Binutils, et Findutils. 
+  L'installation de trois paquets pour des tests peut vous sembler excessive, mais c'est très rassurant,  
+  sinon essentiel, de savoir que les outils les plus importants fonctionnent correctement.</para>
 
 </sect1>

Modified: trunk/clfs/the-end/downloadclient.xml
===================================================================
--- trunk/clfs/the-end/downloadclient.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/the-end/downloadclient.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -60,10 +60,10 @@
 gawk 'BEGIN {
   NetService = "/inet/tcp/0/mirror.anl.gov/80"
   print "GET /pub/gnu/wget/wget-1.14.tar.xz" |& NetService
-  while ((NetService |& getline) > 0)
+  while ((NetService |& getline) > 0)
     print $0
   close(NetService)
-}' > binary
+}' > binary
 
 gawk '{q=p;p=$0}NR>1{print q}END{ORS = ""; print p}' binary > wget-1.14.tar.xz 
 

Modified: trunk/clfs/the-end/reboot.xml
===================================================================
--- trunk/clfs/the-end/reboot.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/the-end/reboot.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -48,7 +48,8 @@
 fi
 umount -v ${CLFS}/dev
 umount -v ${CLFS}/proc
-umount -v ${CLFS}/sys</userinput></screen>
+umount ${CLFS}/sys
+umount ${CLFS}/run</userinput></screen>
 
   <para>Démontez le système de fichiers CLFS :</para>
 

Modified: trunk/clfs/users_groups.ent
===================================================================
--- trunk/clfs/users_groups.ent	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/users_groups.ent	2014-10-24 11:23:35 UTC (rev 6609)
@@ -7,8 +7,10 @@
 <!ENTITY uid-daemon "2">
 <!ENTITY uid-adm "3">
 <!ENTITY uid-lp "10">
+<!ENTITY uid-messagebus "27">
 <!ENTITY uid-mail "30">
 <!ENTITY uid-news "31">
+<!ENTITY uid-systemd-timesync "41">
 <!ENTITY uid-operator "50">
 <!ENTITY uid-postmaster "51">
 <!ENTITY uid-nobody "65534">
@@ -34,8 +36,11 @@
 <!ENTITY gid-adm "16">
 <!ENTITY gid-console "17">
 <!ENTITY gid-cdrw "18">
+<!ENTITY gid-messagebus "27">
+<!ENTITY gid-systemd-journal "28">
 <!ENTITY gid-mail "30">
 <!ENTITY gid-news "31">
+<!ENTITY gid-wheel "39">
+<!ENTITY gid-systemd-timesync "41">
 <!ENTITY gid-users "1000">
 <!ENTITY gid-nogroup "65533">
-<!ENTITY gid-nobody "65534">

Modified: trunk/clfs/x86-index.xml
===================================================================
--- trunk/clfs/x86-index.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/x86-index.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -29,7 +29,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86-chapter.xml"/>
 
   </part>
 
@@ -60,7 +60,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/x86-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>

Modified: trunk/clfs/x86_64-64-index.xml
===================================================================
--- trunk/clfs/x86_64-64-index.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/x86_64-64-index.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -29,7 +29,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-64-chapter.xml"/>
 
   </part>
 
@@ -60,7 +60,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/x86_64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>

Modified: trunk/clfs/x86_64-index.xml
===================================================================
--- trunk/clfs/x86_64-index.xml	2014-10-23 20:20:19 UTC (rev 6608)
+++ trunk/clfs/x86_64-index.xml	2014-10-24 11:23:35 UTC (rev 6609)
@@ -29,7 +29,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-chapter.xml"/>
 
   </part>
 
@@ -60,7 +60,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/x86_64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>



More information about the lfs-traducfr mailing list