[lfs-fr] r1249 - in trunk/clfs: . boot/common boot/ppc64 cross-tools/ppc64 final-system/common final-system/multilib final-system/x86 introduction/common materials/common temp-system/common temp-system/multilib

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Dim 9 Jan 08:44:04 PST 2011


Author: jmengual
Date: 2011-01-09 17:44:04 +0100 (Sun, 09 Jan 2011)
New Revision: 1249

Modified:
   trunk/clfs/boot/common/sysvinit.xml
   trunk/clfs/boot/ppc64/e2fsprogs-libs.xml
   trunk/clfs/cross-tools/ppc64/eglibc-64bit.xml
   trunk/clfs/final-system/common/iputils.xml
   trunk/clfs/final-system/common/man.xml
   trunk/clfs/final-system/common/sysvinit.xml
   trunk/clfs/final-system/common/tar.xml
   trunk/clfs/final-system/common/vim.xml
   trunk/clfs/final-system/common/xz.xml
   trunk/clfs/final-system/multilib/man.xml
   trunk/clfs/final-system/multilib/multiarch_wrapper.xml
   trunk/clfs/final-system/multilib/ncurses-64bit.xml
   trunk/clfs/final-system/multilib/ncurses-n32.xml
   trunk/clfs/final-system/multilib/sysvinit.xml
   trunk/clfs/final-system/multilib/tar.xml
   trunk/clfs/final-system/multilib/vim.xml
   trunk/clfs/final-system/multilib/xz-64bit.xml
   trunk/clfs/final-system/multilib/xz-n32.xml
   trunk/clfs/final-system/multilib/xz.xml
   trunk/clfs/final-system/x86/grub.xml
   trunk/clfs/introduction/common/changelog.xml
   trunk/clfs/materials/common/packages.xml
   trunk/clfs/materials/common/patches.xml
   trunk/clfs/packages.ent
   trunk/clfs/patches.ent
   trunk/clfs/temp-system/common/vim.xml
   trunk/clfs/temp-system/multilib/coreutils.xml
   trunk/clfs/temp-system/multilib/vim.xml
Log:
Diverses mises a jour


Modified: trunk/clfs/boot/common/sysvinit.xml
===================================================================
--- trunk/clfs/boot/common/sysvinit.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/boot/common/sysvinit.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -22,15 +22,14 @@
   <sect2 role="installation">
     <title>Installation de Sysvinit</title>
 
-    <para os="aa">Faites quelques modifications pour vous permettre de démarrer dans le système temporaire minimal :</para>
 
-<screen os="ab"><userinput>cp -v src/Makefile src/Makefile.orig
-sed -e 's at root@0 at g' \
-    -e "s@/dev/initctl@${CLFS}&@g" \
-    -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3 at g' \
-    -e "s@/usr/lib@/tools/lib@" \
-    src/Makefile.orig > src/Makefile</userinput></screen>
+    <para os="aa">Les modifications suivantes aident à localiser des fichiers 
+    spécifiques à cette construction en particulier :</para>
 
+<screen os="ab"><userinput>cp -v src/Makefile{,.orig}
+sed -e 's,/usr/lib,/tools/lib,g' \
+    src/Makefile.orig > src/Makefile</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/sysvinit.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -42,7 +41,7 @@
     href="../../final-system/common/sysvinit.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ad"><userinput>make -C src install INSTALL=install ROOT=${CLFS}</userinput></screen>
+<screen os="ad"><userinput>make -C src ROOT=${CLFS} install</userinput></screen>
 
   </sect2>
 

Modified: trunk/clfs/boot/ppc64/e2fsprogs-libs.xml
===================================================================
--- trunk/clfs/boot/ppc64/e2fsprogs-libs.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/boot/ppc64/e2fsprogs-libs.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -59,7 +59,8 @@
     href="../64/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>make libs</userinput></screen>
+<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"

Modified: trunk/clfs/cross-tools/ppc64/eglibc-64bit.xml
===================================================================
--- trunk/clfs/cross-tools/ppc64/eglibc-64bit.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/cross-tools/ppc64/eglibc-64bit.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -6,7 +6,7 @@
 ]>
 
 <sect1 id="ch-cross-tools-eglibc-64" role="wrap">
-  <?dbhtml filename="glibc-64.html"?>
+  <?dbhtml filename="eglibc-64.html"?>
 
   <title>EGLIBC-&eglibc-version; 64-Bit</title>
 

Modified: trunk/clfs/final-system/common/iputils.xml
===================================================================
--- trunk/clfs/final-system/common/iputils.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/common/iputils.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -35,7 +35,7 @@
 
     <para os="a">Compilez le paquet :</para>
 
-<screen os="b"><userinput>make IPV4_TARGETS="tracepath ping clockdiff" \
+<screen os="b"><userinput>make IPV4_TARGETS="tracepath ping rdisc clockdiff" \
     IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
 
     <para os="c">Ce paquet est fourni sans suite de tests.</para>
@@ -58,7 +58,7 @@
       <segtitle>Programmes installés</segtitle>
 
       <seglistitem>
-        <seg>arping, clockdiff, ping, ping6, rdisc, tracepath, tracepath6 et traceroute6</seg>
+        <seg>clockdiff, ping, rdisc, tracepath, tracepath6, and traceroute6</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/clfs/final-system/common/man.xml
===================================================================
--- trunk/clfs/final-system/common/man.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/common/man.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -29,10 +29,6 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&man-i18n-patch;</userinput></screen>
 
-    <para os="p3">Le correctif suivant ajoute le support pour les nouveaux outils de compression comme XZ Utils :</para>
-    
-<screen os="p4"><userinput>patch -Np1 -i ../&man-new_compressors-patch;</userinput></screen>
-
     <para os="a">Il faut effectuer quelques ajustements aux sources de Man.</para>
 
     <para os="b">D'abord, une substitution <command>sed</command> est nécessaire pour ajouter l'option <option>-R</option> à 

Modified: trunk/clfs/final-system/common/sysvinit.xml
===================================================================
--- trunk/clfs/final-system/common/sysvinit.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/common/sysvinit.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -24,10 +24,6 @@
   <sect2 role="installation">
     <title>Installation de Sysvinit</title>
 
-    <para os="p1">Le correctif suivant contient un certain nombre de mises à jour vers  &sysvinit-version; :</para>
-    
-<screen os="p2"><userinput>patch -Np1 -i ../&sysvinit-fixes-patch;</userinput></screen>
-
     <para os="c">Compilez le paquet :</para>
 
 <screen os="d"><userinput>make -C src clobber

Modified: trunk/clfs/final-system/common/tar.xml
===================================================================
--- trunk/clfs/final-system/common/tar.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/common/tar.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -30,7 +30,8 @@
 
     <para os="a">Préparez la compilation de Tar :</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
+<screen os="b"><userinput>FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr \
+     --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
 
     <para os="c">Compilez le paquet :</para>
 

Modified: trunk/clfs/final-system/common/vim.xml
===================================================================
--- trunk/clfs/final-system/common/vim.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/common/vim.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -34,9 +34,6 @@
       des instructions d'installation.</para>
     </tip>
 
-    <para os="a">D'abord, déballez les archives <filename>vim-&vim-version;.tar.bz2</filename>
-    et (de manière optionnelle) celles <filename>vim-&vim-version;-lang.tar.gz</filename> dans le même répertoire.</para>
-
     <para os="p1">Le correctif suivant incorpore toutes les mises à jour de la branche &vim-version; issue des 
     développeurs de Vim :</para>
 
@@ -49,7 +46,7 @@
 
     <para os="d">Préparez la compilation de Vim :</para>
 
-<screen os="e"><userinput>CPPFLAGS="-DUNUSED=" ./configure \
+<screen os="e"><userinput>./configure \
     --prefix=/usr --enable-multibyte</userinput></screen>
 
     <variablelist os="f">

Modified: trunk/clfs/final-system/common/xz.xml
===================================================================
--- trunk/clfs/final-system/common/xz.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/common/xz.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -42,6 +42,10 @@
 
 <screen os="h"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
 
+    <para os="i">Déplacez les bibliothèques statiques au bon endroit :</para>
+
+<screen os="j"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-xz" role="content">

Modified: trunk/clfs/final-system/multilib/man.xml
===================================================================
--- trunk/clfs/final-system/multilib/man.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/man.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -31,14 +31,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/multilib/multiarch_wrapper.xml
===================================================================
--- trunk/clfs/final-system/multilib/multiarch_wrapper.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/multiarch_wrapper.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -62,21 +62,16 @@
   if (pid == 0) {
     execvp(filename, argv);
     perror(filename);
-    goto end;
   } else if (pid < 0) {
-    goto end_error;
+    perror(argv[0]);
   } else {
     if (waitpid(pid, &status, 0) != pid) {
       status = EXIT_FAILURE;
-      goto end_error;
+      perror(argv[0]);
+    } else {
+      status = WEXITSTATUS(status);
     }
-    status = WEXITSTATUS(status);
   }
-  goto end;
-
-end_error:
-  perror(argv[0]);
-end:
   free(filename);
 
   return status;

Modified: trunk/clfs/final-system/multilib/ncurses-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/ncurses-64bit.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/ncurses-64bit.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -72,8 +72,7 @@
 
     <para os="j">Créez les liens symboliques dans <filename class="directory">/usr/lib64 :</filename></para>
 
-<screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw,cursesw}.so
-ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libcursesw.so
+<screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
 ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so
 ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so
 ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so

Modified: trunk/clfs/final-system/multilib/ncurses-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/ncurses-n32.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/ncurses-n32.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -72,8 +72,7 @@
 
     <para os="j">Créez les liens symboliques dans <filename class="directory">/usr/lib32 :</filename></para>
 
-<screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw,cursesw}.so
-ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libcursesw.so
+<screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
 ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libncursesw.so
 ln -svf ../../lib32/libmenuw.so.5 /usr/lib32/libmenuw.so
 ln -svf ../../lib32/libpanelw.so.5 /usr/lib32/libpanelw.so

Modified: trunk/clfs/final-system/multilib/sysvinit.xml
===================================================================
--- trunk/clfs/final-system/multilib/sysvinit.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/sysvinit.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -22,14 +22,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen os="d"><userinput>make -C src clobber

Modified: trunk/clfs/final-system/multilib/tar.xml
===================================================================
--- trunk/clfs/final-system/multilib/tar.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/tar.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -33,8 +33,9 @@
     href="../common/tar.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
+<screen os="b"><userinput>FORCE_UNSAFE_CONFIGURE=1 CC="gcc ${BUILD64}" \
+  ./configure --prefix=/usr \
+    --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"

Modified: trunk/clfs/final-system/multilib/vim.xml
===================================================================
--- trunk/clfs/final-system/multilib/vim.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/vim.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -27,10 +27,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -50,7 +46,7 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
 <screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    CPPFLAGS="-DUNUSED=" ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
     --enable-multibyte</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/multilib/xz-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/xz-64bit.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/xz-64bit.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -51,6 +51,12 @@
     href="xz.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="xz.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/multilib/xz-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/xz-n32.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/xz-n32.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -52,6 +52,12 @@
     href="xz.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="xz.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/xz.xml
===================================================================
--- trunk/clfs/final-system/multilib/xz.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/multilib/xz.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -52,6 +52,14 @@
     href="../common/xz.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/xz.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/xz.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/x86/grub.xml
===================================================================
--- trunk/clfs/final-system/x86/grub.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/final-system/x86/grub.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -16,48 +16,49 @@
   <sect2 role="package">
     <title/>
 
-    <para>The GRUB package contains the GRand Unified Bootloader.</para>
+    <para>Le paquet GRUB contient le <foreignphrase>GRand Unified Bootloader</foreignphrase>.</para>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of GRUB</title>
+    <title>Installation de GRUB</title>
 
     <note os="n1">
-      <para>If you would like use a different bootloader than this
-      one you can go to the following link for alterative bootloaders
-      and the instructions to use them. 
+      <para>Si vous aimeriez utiliser un autre chargeur de démarrage, vous pouvez
+      vous rendre à l'adresse suivante pour des chargeurs de démarrage alternatifs
+      et les instructions pour les utiliser.
       <ulink url="http://trac.cross-lfs.org/wiki/bootloaders"/></para>
     </note>
 
     <note os="n2">
-      <para>This package is known to have issues when its default optimization
-      flags (including the <option>-march</option> and <option>-mcpu</option>
-      options) are changed. If any environment variables that override default
-      optimizations have been defined, such as <envar>CFLAGS</envar> and
-      <envar>CXXFLAGS</envar>, unset them when building GRUB.</para>
+      <para>Ce paquet est connu pour avoir des problèmes quand on change ses 
+      drapeaux d'optimisation (y compris les options <option>-march</option> et
+      <option>-mcpu</option>). Si vous avez défini une variable d'environnement
+      remplaçant les optimisations par défaut, telles que <envar>CFLAGS</envar>
+      et <envar>CXXFLAGS</envar>, désinitialisez-les lors de la construction de
+      GRUB.</para>
     </note>
 
-    <para os="a">Prepare GRUB for compilation:</para>
+    <para os="a">Préparez la construction de GRUB :</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr \
     --sysconfdir=/etc</userinput></screen>
 
-    <para os="c">Compile the package:</para>
+    <para os="c">Compilez le paquet :</para>
 
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test GRUB you must have QEMU installed and then, issue:
+    <para os="e">Pour tester GRUB vous devez avoir installé QEMU et lancer :
     <userinput>make check</userinput>.</para>
 
-    <para os="f">Install the package:</para>
+    <para os="f">Installez le paquet :</para>
 
 <screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
 
   <sect2 id="conf-grub" role="configuration">
-    <title>Configuring GRUB</title>
+    <title>Configurer GRUB</title>
 
     <indexterm zone="conf-grub">
       <primary sortas="a-GRUB">GRUB</primary>
@@ -67,9 +68,9 @@
       <primary sortas="e-/etc/default/grub">/etc/default/grub</primary>
     </indexterm>
 
-    <para>Now that grub is installed, we need to configure the defaults that
-    will be used to generate the configuration after we install the kernel.
-    Create this file with the following:</para>
+    <para>Maintenant que grub est installé, il faut configurer les paramètres
+    par défaut Utilisés pour générer la configuration après qu'on a installé 
+    le noyau. Créez ce fichier avec ce qui suit :</para>
 
 <screen><userinput>install -m755 -dv /etc/default
 cat > /etc/default/grub << "EOF"
@@ -87,6 +88,7 @@
 
 #GRUB_TERMINAL=console
 #GRUB_GFXMODE=640x480
+#GRUB_GFXPAYLOAD_LINUX=keep
 
 #GRUB_DISABLE_LINUX_UUID=true
 #GRUB_DISABLE_LINUX_RECOVERY=true
@@ -99,8 +101,8 @@
 EOF</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the above options and possible alternate
-      values:</title>
+      <title>Voici la signification des options ci-dessus et les autres valeurs
+      possibles :</title>
 
     <varlistentry>
       <term><parameter>GRUB_DEFAULT=</parameter></term>
@@ -173,6 +175,13 @@
     </varlistentry>
 
     <varlistentry>
+      <term><parameter>GRUB_GFXPAYLOAD_LINUX=</parameter></term>
+      <listitem>
+        <para>Write Me</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><parameter>GRUB_DEFAULT=</parameter></term>
       <listitem>
         <para>Write Me</para>
@@ -212,27 +221,28 @@
   </sect2>
 
   <sect2 id="contents-grub" role="content">
-    <title>Contents of GRUB</title>
+    <title>Contenu de GRUB</title>
 
     <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
+      <segtitle>Programmes installés</segtitle>
+      <segtitle>Répertoires installés</segtitle>
 
       <seglistitem>
-        <seg>grub, grub-install, grub-md5-crypt, grub-set-default, grub-terminfo, and mbchk</seg>
+        <seg>grub, grub-install, grub-md5-crypt, grub-set-default, grub-terminfo, et mbchk</seg>
         <seg>/usr/lib/grub, /boot/grub</seg>
       </seglistitem>
     </segmentedlist>
 
     <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="grub">
         <term><command>grub</command></term>
         <listitem>
-          <para>The Grand Unified Bootloader's command shell</para>
+          <para>La ligne de commande de <foreignphrase>Grand Unified 
+          Bootloader</foreignphrase></para>
           <indexterm zone="ch-system-grub grub">
             <primary sortas="b-grub">grub</primary>
           </indexterm>
@@ -242,7 +252,7 @@
       <varlistentry id="grub-install">
         <term><command>grub-install</command></term>
         <listitem>
-          <para>Installs GRUB on the given device</para>
+          <para>Installe GRUB sur le périphérique donné</para>
           <indexterm zone="ch-system-grub grub-install">
             <primary sortas="b-grub-install">grub-install</primary>
           </indexterm>
@@ -252,7 +262,7 @@
       <varlistentry id="grub-md5-crypt">
         <term><command>grub-md5-crypt</command></term>
         <listitem>
-          <para>Encrypts a password in MD5 format</para>
+          <para>Chiffre un mot de passe au format MD5</para>
           <indexterm zone="ch-system-grub grub-md5-crypt">
             <primary sortas="b-grub-md5-crypt">grub-md5-crypt</primary>
           </indexterm>
@@ -262,7 +272,7 @@
       <varlistentry id="grub-set-default">
         <term><command>grub-set-default</command></term>
         <listitem>
-          <para>Sets the default boot entry for GRUB</para>
+          <para>Règle l'entrée de démarrage par défaut pour GRUB</para>
           <indexterm zone="ch-system-grub grub-set-default">
             <primary sortas="b-grub-set-default">grub-set-default</primary>
           </indexterm>
@@ -272,8 +282,8 @@
       <varlistentry id="grub-terminfo">
         <term><command>grub-terminfo</command></term>
         <listitem>
-          <para>Generates a terminfo command from a terminfo name; it can be
-          employed if an unknown terminal is being used</para>
+          <para>Génère une commande terminfo à partir d'un nom terminfo ;
+          on peut l'utiliser si on va utiliser un terminal inconnu</para>
           <indexterm zone="ch-system-grub grub-terminfo">
             <primary sortas="b-grub-terminfo">grub-terminfo</primary>
           </indexterm>
@@ -283,7 +293,7 @@
       <varlistentry id="mbchk">
         <term><command>mbchk</command></term>
         <listitem>
-          <para>Checks the format of a multi-boot kernel</para>
+          <para>Vérifie le format d'un noyau multi-amorçage</para>
           <indexterm zone="ch-system-grub mbchk">
             <primary sortas="b-mbchk">mbchk</primary>
           </indexterm>

Modified: trunk/clfs/introduction/common/changelog.xml
===================================================================
--- trunk/clfs/introduction/common/changelog.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/introduction/common/changelog.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -41,6 +41,46 @@
       <para>8 janvier 2011</para>
       <itemizedlist>
          <listitem>
+          <para>[jciccone] - Mise à jour de Sysvinit vers 2.88dsf.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de DHCPCD vers 5.2.10.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour du Multiarch Wrapper basée sur les
+          modifications de DX-MON.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de Bootscripts vers 1.2-pre11.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de Vim vers 7.3.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour d'Udev vers 165.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de Man vers 1.6g.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour d'IPutils vers s20101006.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour d'Autoconf vers 2.68.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour d'IPRoute2 vers 2.6.37.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de Libtool vers 2.4.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour d'E2fsprogs vers 1.41.14.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Mise à jour de Psmisc vers 22.13.</para>
+         </listitem>
+         <listitem>
           <para>[jciccone] - Mise à jour du correctif de la branche mise à jour
           d'NCurses vers -22.</para>
         </listitem>

Modified: trunk/clfs/materials/common/packages.xml
===================================================================
--- trunk/clfs/materials/common/packages.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/materials/common/packages.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -527,15 +527,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Vim (&vim-version;) language files (optional) - <token>&vim-language-size;</token> :</term>
-      <listitem>
-        <para>Page d'accueil : <ulink url="&vim-language-home;"/></para>
-        <para>Téléchargement : <ulink url="&vim-language-url;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&vim-language-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>XZ Utils  (&xz-version;) - <token>&xz-size;</token> :</term>
       <listitem>
         <para>Page d'accueil : <ulink url="&xz-home;"/></para>

Modified: trunk/clfs/materials/common/patches.xml
===================================================================
--- trunk/clfs/materials/common/patches.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/materials/common/patches.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -93,15 +93,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Man correctif nouveaux outils de compression - <token>&man-new_compressors-patch-size;</token> :</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&man-new_compressors-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&man-new_compressors-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Ncurses Correctif Bash - <token>&ncurses-bashfix-patch-size;</token> :</term>
       <listitem>
         <para>Téléchargement : <ulink
@@ -138,15 +129,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Sysvinit correctifs - <token>&sysvinit-fixes-patch-size;</token> :</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&sysvinit-fixes-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&sysvinit-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Tar correctif pages de man - <token>&tar-man-patch-size;</token> :</term>
       <listitem>
         <para>Téléchargement : <ulink

Modified: trunk/clfs/packages.ent
===================================================================
--- trunk/clfs/packages.ent	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/packages.ent	2011-01-09 16:44:04 UTC (rev 1249)
@@ -17,14 +17,14 @@
 <!ENTITY arcload-md5 "b00e1c79074a13c2de97748f56f9bd1f">
 <!ENTITY arcload-home "http://www.linux-mips.org/wiki/ARCLoad">
 
-<!ENTITY autoconf-version "2.67">
-<!ENTITY autoconf-size "1,132 Kio">
+<!ENTITY autoconf-version "2.68">
+<!ENTITY autoconf-size "1,144 Kio">
 <!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.xz">
-<!ENTITY autoconf-md5 "1da24eebe4e6a774e4039242a4f06aad">
+<!ENTITY autoconf-md5 "723677f7727542d273112e7feb870a7a">
 <!ENTITY autoconf-home "&gnu-software;autoconf">
 
-<!ENTITY automake-version "1.11">
-<!ENTITY automake-version2 "&automake-version;.1">
+<!ENTITY automake-version2 "1.11">
+<!ENTITY automake-version "&automake-version2;.1">
 <!ENTITY automake-size "1.044 Kio">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
 <!ENTITY automake-md5 "c2972c4d9b3e29c03d5f2af86249876f">
@@ -49,10 +49,10 @@
 <!ENTITY bison-md5 "c1d3ea81bc370dbd43b6f0b2cd21287e">
 <!ENTITY bison-home "&gnu-software;bison">
 
-<!ENTITY bootscripts-clfs-version "1.2-pre10">
-<!ENTITY bootscripts-clfs-size "40 Kio">
+<!ENTITY bootscripts-clfs-version "1.2-pre11">
+<!ENTITY bootscripts-clfs-size "44 Kio">
 <!ENTITY bootscripts-clfs-url "&packages-root;bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.bz2">
-<!ENTITY bootscripts-clfs-md5 "255d140ce9da3a64f4cca975bbdeec95">
+<!ENTITY bootscripts-clfs-md5 "f105f94f59ad534968ff679f2293ddd6">
 <!ENTITY bootscripts-clfs-home " ">
 
 <!ENTITY bzip2-version "1.0.6">
@@ -85,10 +85,10 @@
 <!ENTITY dejagnu-md5 "053f18fd5d00873de365413cab17a666">
 <!ENTITY dejagnu-home "&gnu-software;dejagnu">
 
-<!ENTITY dhcpcd-version "5.2.7">
-<!ENTITY dhcpcd-size "68 Kio">
+<!ENTITY dhcpcd-version "5.2.10">
+<!ENTITY dhcpcd-size "72 Kio">
 <!ENTITY dhcpcd-url "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
-<!ENTITY dhcpcd-md5 "1dcf377270a13cc774c9a26fc50453b5">
+<!ENTITY dhcpcd-md5 "c65e8cef3281eaf2e12a84bd882f5c63">
 <!ENTITY dhcpcd-home "http://roy.marples.name/projects/dhcpcd">
 
 <!ENTITY diffutils-version "3.0">
@@ -103,10 +103,10 @@
 <!ENTITY dvhtool-md5 "4448c01e6a015685af90a79fbea8da4e">
 <!ENTITY dvhtool-home "http://packages.qa.debian.org/d/dvhtool.html">
 
-<!ENTITY e2fsprogs-version "1.41.12">
-<!ENTITY e2fsprogs-size "4,392 Kio">
+<!ENTITY e2fsprogs-version "1.41.14">
+<!ENTITY e2fsprogs-size "4,408 Kio">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "1b24a21fc0c2381ef420961cbfec733f">
+<!ENTITY e2fsprogs-md5 "05f70470aea2ef7efbb0845b2b116720">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
 
 <!ENTITY eglibc-version "2.12">
@@ -217,16 +217,16 @@
 <!ENTITY iana-etc-home "http://www.archlinux.org/packages/core/any/iana-etc/">
 <!-- <!ENTITY iana-etc-home "http://sethwklein.net/iana-etc"> -->
 
-<!ENTITY iproute2-version "2.6.34">
+<!ENTITY iproute2-version "2.6.37">
 <!ENTITY iproute2-size "380 Kio">
 <!ENTITY iproute2-url "http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.bz2">
-<!ENTITY iproute2-md5 "5c5742bdac05a1688f266512e685b83c">
+<!ENTITY iproute2-md5 "9774ff9d74ebd301bf56bd8d74473786">
 <!ENTITY iproute2-home "http://www.linuxfoundation.org/en/Net:Iproute2">
 
-<!ENTITY iputils-version "s20100418">
+<!ENTITY iputils-version "s20101006">
 <!ENTITY iputils-size "96 Kio">
 <!ENTITY iputils-url "http://www.skbuff.net/iputils/iputils-&iputils-version;.tar.bz2">
-<!ENTITY iputils-md5 "df6b0062118cdc5c62e3c810f831e976">
+<!ENTITY iputils-md5 "a36c25e9ec17e48be514dc0485e7376c">
 <!ENTITY iputils-home "http://www.linuxfoundation.org/en/Net:Iputils">
 
 <!ENTITY kbd-version "1.15.2">
@@ -241,10 +241,10 @@
 <!ENTITY less-md5 "817bf051953ad2dea825a1cdf460caa4">
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less">
 
-<!ENTITY libtool-version "2.2.10">
-<!ENTITY libtool-size "772 Kio">
-<!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.lzma">
-<!ENTITY libtool-md5 "2eba13ecd07653d0e34d4efe8e2974d8">
+<!ENTITY libtool-version "2.4">
+<!ENTITY libtool-size "836 Kio">
+<!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.xz">
+<!ENTITY libtool-md5 "4e6144439d95d7332dc50ace6dd24c55">
 <!ENTITY libtool-home "&gnu-software;libtool">
 
 <!ENTITY linux-dl-version "2.6">
@@ -267,10 +267,10 @@
 <!ENTITY make-md5 "1a11100f3c63fcf5753818e59d63088f">
 <!ENTITY make-home "&gnu-software;make">
 
-<!ENTITY man-version "1.6f">
-<!ENTITY man-size "248 Kio">
+<!ENTITY man-version "1.6g">
+<!ENTITY man-size "252 Kio">
 <!ENTITY man-url "http://primates.ximian.com/~flucifredi/man/man-&man-version;.tar.gz">
-<!ENTITY man-md5 "67aaaa6df35215e812fd7d89472c44b6">
+<!ENTITY man-md5 "ba154d5796928b841c9c69f0ae376660">
 <!ENTITY man-home "http://primates.ximian.com/~flucifredi/man">
 
 <!ENTITY man-pages-version "3.32">
@@ -339,10 +339,10 @@
 <!ENTITY procps-md5 "9532714b6846013ca9898984ba4cd7e0">
 <!ENTITY procps-home "http://procps.sourceforge.net">
 
-<!ENTITY psmisc-version "22.12">
-<!ENTITY psmisc-size "368 Kio">
+<!ENTITY psmisc-version "22.13">
+<!ENTITY psmisc-size "376 Kio">
 <!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
-<!ENTITY psmisc-md5 "16c83a351c292cfc845b27d6395e05fb">
+<!ENTITY psmisc-md5 "e2c339e6b65b730042084023784a729e">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net">
 
 <!ENTITY readline-version2 "6">
@@ -376,11 +376,11 @@
 <!ENTITY silo-md5 "168182dfa0025914ceecac9591a6674c">
 <!ENTITY silo-home "">
 
-<!ENTITY sysvinit-version "2.86">
-<!ENTITY sysvinit-size "96 Kio">
-<!ENTITY sysvinit-url "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-&sysvinit-version;.tar.gz">
+<!ENTITY sysvinit-version "2.88dsf">
+<!ENTITY sysvinit-size "104 Kio">
+<!ENTITY sysvinit-url "http://download.savannah.gnu.org/releases/sysvinit/sysvinit-&sysvinit-version;.tar.gz">
 <!ENTITY sysvinit-md5 "7d5d61c026122ab791ac04c8a84db967">
-<!ENTITY sysvinit-home " ">
+<!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
 
 <!ENTITY tar-version "1.25">
 <!ENTITY tar-size "2,276 Kio">
@@ -401,10 +401,10 @@
 <!ENTITY texinfo-md5 "71ba711519209b5fb583fed2b3d86fcb">
 <!ENTITY texinfo-home "&gnu-software;texinfo">
 
-<!ENTITY udev-version "160">
-<!ENTITY udev-size "532 Kio">
+<!ENTITY udev-version "165">
+<!ENTITY udev-size "566 Kio">
 <!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "65459a1f090082c0471bf4e5112208d7">
+<!ENTITY udev-md5 "74c62aa82969278960b7ee81e94b6d8f">
 <!ENTITY udev-home "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
 
 <!ENTITY uname_hack-version "20080713">
@@ -424,16 +424,12 @@
 <!ENTITY util-linux-ng-uuid-id "1.3.0">
 <!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
 
-<!ENTITY vim-version "7.2">
-<!ENTITY vim-version2 "72">
-<!ENTITY vim-size "7,034 Kio">
+<!ENTITY vim-version "7.3">
+<!ENTITY vim-version2 "73">
+<!ENTITY vim-size "8,868 Kio">
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "f0901284b338e448bfd79ccca0041254">
+<!ENTITY vim-md5 "5b9510a17074e2b37d8bb38ae09edbf2">
 <!ENTITY vim-home "http://www.vim.org">
-<!ENTITY vim-language-size "1,333 Kio">
-<!ENTITY vim-language-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz">
-<!ENTITY vim-language-md5 "d8884786979e0e520c112faf2e176f05">
-<!ENTITY vim-language-home " ">
 
 <!ENTITY xz-version "5.0.0">
 <!ENTITY xz-size "984 Kio">

Modified: trunk/clfs/patches.ent
===================================================================
--- trunk/clfs/patches.ent	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/patches.ent	2011-01-09 16:44:04 UTC (rev 1249)
@@ -29,21 +29,17 @@
 <!ENTITY grep-fixes-patch-size "12 Kio">
 
 <!ENTITY iputils-fixes-patch "iputils-&iputils-version;-fixes-1.patch">
-<!ENTITY iputils-fixes-patch-md5 "138913183f50dba3ed096bb55a8e5d08">
+<!ENTITY iputils-fixes-patch-md5 "1add4b8cbee814310f95e61997019162">
 <!ENTITY iputils-fixes-patch-size "8 Kio">
 
 <!ENTITY iputils-doc-patch "iputils-&iputils-version;-doc-1.patch">
-<!ENTITY iputils-doc-patch-md5 "ca2642c8c92df6f8257f925daaadce6b">
+<!ENTITY iputils-doc-patch-md5 "2eee5e095005bf4be426797a4aefa27b">
 <!ENTITY iputils-doc-patch-size "136 Kio">
 
 <!ENTITY man-i18n-patch "man-&man-version;-i18n-1.patch">
-<!ENTITY man-i18n-patch-md5 "8b189d6500461797250ae9f3e5638dd5">
-<!ENTITY man-i18n-patch-size "10 Kio">
+<!ENTITY man-i18n-patch-md5 "a5aba0cb5a95a7945db8c882334b7dab">
+<!ENTITY man-i18n-patch-size "12 Kio">
 
-<!ENTITY man-new_compressors-patch "man-&man-version;-new_compressors-1.patch">
-<!ENTITY man-new_compressors-patch-md5 "efebe29737e80c2f6de4833182f1edb6">
-<!ENTITY man-new_compressors-patch-size "2 Kio">
-
 <!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">
 <!ENTITY ncurses-bashfix-patch-md5 "c6f7f2ab0ebaf7721ebeb266641352db">
 <!ENTITY ncurses-bashfix-patch-size ".7 Kio">
@@ -60,10 +56,6 @@
 <!ENTITY readline-branch_update-patch-md5 "91bb18428fcacb91b3f4c09d219e1258">
 <!ENTITY readline-branch_update-patch-size "4 Kio">
 
-<!ENTITY sysvinit-fixes-patch "sysvinit-&sysvinit-version;-fixes-1.patch">
-<!ENTITY sysvinit-fixes-patch-md5 "405d23896b54ca61afd53003a62592fd">
-<!ENTITY sysvinit-fixes-patch-size "20 Kio">
-
 <!ENTITY tar-man-patch "tar-&tar-version;-man-1.patch">
 <!ENTITY tar-man-patch-md5 "6a1a1d8bdc00fc149c28aa1f8405fc93">
 <!ENTITY tar-man-patch-size "20 Kio">
@@ -72,9 +64,9 @@
 <!ENTITY texinfo-new_compressors-patch-md5 "4ae2d3c132e21cb83b825bc691056d07">
 <!ENTITY texinfo-new_compressors-patch-size "2 Kio">
 
-<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-21.patch">
-<!ENTITY vim-branch_update-patch-md5 "68e540fbf2a06d9760a9b4d4b486b506">
-<!ENTITY vim-branch_update-patch-size "737 Kio">
+<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-1.patch">
+<!ENTITY vim-branch_update-patch-md5 "c1866b7f2f945993b8fc2bb94606bc17">
+<!ENTITY vim-branch_update-patch-size "220 Kio">
 
 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-2.patch">
 <!ENTITY zlib-fpic-patch-md5 "b1e6644c97b04c368e11c0a1554f2efe">

Modified: trunk/clfs/temp-system/common/vim.xml
===================================================================
--- trunk/clfs/temp-system/common/vim.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/temp-system/common/vim.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -24,16 +24,18 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/vim.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/vim.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
+    <para os="s1">Le script configure a un seul test en dur qui ne peut pas 
+    réussir par une entrée de cache. Désactivez ce test avec la commande
+    suivante :</para>
+
+<screen os="s2"><userinput>sed -i "/using uint32_t/s/as_fn_error/#&/" src/auto/configure</userinput></screen>
+
     <para os="c1">Le script <command>configure</command> est tel qu'il s'arrête au premier signe d'une compilation croisée. 
     Améliorez cela en initialisant les valeurs en cache de ces tests avec la commande 
     suivante :</para>
@@ -47,6 +49,9 @@
 vim_cv_toupper_broken=no
 vim_cv_tty_group=world
 ac_cv_sizeof_int=4
+ac_cv_sizeof_long=4
+ac_cv_sizeof_time_t=4
+ac_cv_sizeof_off_t=4
 EOF</userinput></screen>
 
   <para os="b">Modifiez l'emplacement par défaut du fichier de configuration 
@@ -59,7 +64,7 @@
     href="../../final-system/common/vim.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>CPPFLAGS="-DUNUSED=" ./configure \
+<screen os="e"><userinput>./configure \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --prefix=/tools --enable-multibyte --enable-gui=no \
     --disable-gtktest --disable-xim --with-features=normal \

Modified: trunk/clfs/temp-system/multilib/coreutils.xml
===================================================================
--- trunk/clfs/temp-system/multilib/coreutils.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/temp-system/multilib/coreutils.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -24,6 +24,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/temp-system/multilib/vim.xml
===================================================================
--- trunk/clfs/temp-system/multilib/vim.xml	2011-01-09 00:19:43 UTC (rev 1248)
+++ trunk/clfs/temp-system/multilib/vim.xml	2011-01-09 16:44:04 UTC (rev 1249)
@@ -24,10 +24,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -54,7 +58,7 @@
     href="../common/vim.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" CPPFLAGS="-DUNUSED=" \
+<screen os="e"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
   ./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
   --prefix=/tools --enable-multibyte --enable-gui=no \
   --disable-gtktest --disable-xim --with-features=normal \




More information about the lfs-traducfr mailing list