[lfs-fr] r1259 - in trunk/clfs: . appendices/dependencies boot boot/64 boot/common boot/multilib chroot chroot/common chroot/multilib final-system final-system/common final-system/mips64 final-system/multilib introduction/common materials/common

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Dim 30 Jan 15:33:14 PST 2011


Author: jmengual
Date: 2011-01-31 00:33:14 +0100 (Mon, 31 Jan 2011)
New Revision: 1259

Added:
   trunk/clfs/boot/64/util-linux.xml
   trunk/clfs/boot/common/util-linux.xml
   trunk/clfs/boot/multilib/util-linux.xml
   trunk/clfs/chroot/common/util-linux.xml
   trunk/clfs/chroot/multilib/util-linux.xml
   trunk/clfs/final-system/common/pkg-config.xml
   trunk/clfs/final-system/common/util-linux.xml
   trunk/clfs/final-system/mips64/pkg-config.xml
   trunk/clfs/final-system/multilib/pkg-config.xml
   trunk/clfs/final-system/multilib/util-linux-64bit.xml
   trunk/clfs/final-system/multilib/util-linux-n32.xml
   trunk/clfs/final-system/multilib/util-linux.xml
Removed:
   trunk/clfs/boot/64/util-linux-ng.xml
   trunk/clfs/boot/common/util-linux-ng.xml
   trunk/clfs/boot/multilib/util-linux-ng.xml
   trunk/clfs/chroot/common/util-linux-ng.xml
   trunk/clfs/chroot/multilib/util-linux-ng.xml
   trunk/clfs/final-system/common/util-linux-ng.xml
   trunk/clfs/final-system/multilib/util-linux-ng-64bit.xml
   trunk/clfs/final-system/multilib/util-linux-ng-n32.xml
   trunk/clfs/final-system/multilib/util-linux-ng.xml
Modified:
   trunk/clfs/appendices/dependencies/common.xml
   trunk/clfs/boot/alpha-chapter.xml
   trunk/clfs/boot/mips-chapter.xml
   trunk/clfs/boot/mips64-64-chapter.xml
   trunk/clfs/boot/mips64-chapter.xml
   trunk/clfs/boot/ppc-chapter.xml
   trunk/clfs/boot/ppc64-chapter.xml
   trunk/clfs/boot/sparc-chapter.xml
   trunk/clfs/boot/sparc64-64-chapter.xml
   trunk/clfs/boot/sparc64-chapter.xml
   trunk/clfs/boot/x86-chapter.xml
   trunk/clfs/boot/x86_64-64-chapter.xml
   trunk/clfs/boot/x86_64-chapter.xml
   trunk/clfs/chroot/alpha-chapter.xml
   trunk/clfs/chroot/mips-chapter.xml
   trunk/clfs/chroot/mips64-64-chapter.xml
   trunk/clfs/chroot/mips64-chapter.xml
   trunk/clfs/chroot/ppc-chapter.xml
   trunk/clfs/chroot/ppc64-chapter.xml
   trunk/clfs/chroot/sparc-chapter.xml
   trunk/clfs/chroot/sparc64-64-chapter.xml
   trunk/clfs/chroot/sparc64-chapter.xml
   trunk/clfs/chroot/x86-chapter.xml
   trunk/clfs/chroot/x86_64-64-chapter.xml
   trunk/clfs/chroot/x86_64-chapter.xml
   trunk/clfs/final-system/alpha-chapter.xml
   trunk/clfs/final-system/common/e2fsprogs.xml
   trunk/clfs/final-system/common/procps.xml
   trunk/clfs/final-system/mips-chapter.xml
   trunk/clfs/final-system/mips64-64-chapter.xml
   trunk/clfs/final-system/mips64-chapter.xml
   trunk/clfs/final-system/multilib/e2fsprogs-64bit.xml
   trunk/clfs/final-system/multilib/e2fsprogs-n32.xml
   trunk/clfs/final-system/multilib/e2fsprogs.xml
   trunk/clfs/final-system/multilib/procps-64bit.xml
   trunk/clfs/final-system/multilib/procps-n32.xml
   trunk/clfs/final-system/multilib/procps.xml
   trunk/clfs/final-system/ppc-chapter.xml
   trunk/clfs/final-system/ppc64-chapter.xml
   trunk/clfs/final-system/sparc-chapter.xml
   trunk/clfs/final-system/sparc64-64-chapter.xml
   trunk/clfs/final-system/sparc64-chapter.xml
   trunk/clfs/final-system/x86-chapter.xml
   trunk/clfs/final-system/x86_64-64-chapter.xml
   trunk/clfs/final-system/x86_64-chapter.xml
   trunk/clfs/general.ent
   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
Log:
Mise a jour de clfs.


Modified: trunk/clfs/appendices/dependencies/common.xml
===================================================================
--- trunk/clfs/appendices/dependencies/common.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/appendices/dependencies/common.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -244,7 +244,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils, E2fsprogs, Findutils, Util-linux-ng</seg>
+          <seg>Diffutils, E2fsprogs, Findutils, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -402,7 +402,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
-         Make, Sed, Texinfo et Util-linux-ng</seg>
+         Make, Pkg-config, Sed, Texinfo et Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1032,6 +1032,34 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin MPC dependency info -->
+  <bridgehead renderas="sect2" id="mpc-dep">MPFR</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, GMP,
+         Make, MPFR, Sed et Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Aucune</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>GCC</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin MPFR dependency info -->
   <bridgehead renderas="sect2" id="mpfr-dep">MPFR</bridgehead>
 
@@ -1113,7 +1141,7 @@
 
         <seglistitem>
           <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
-          Util-linux-ng et Vim</seg>
+          Util-linux et Vim</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1172,6 +1200,34 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Pkg-config dependency info -->
+  <bridgehead renderas="sect2" id="pkg-config-dep">Pkg-config</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
+         Make et Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Aucune</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Util-linux, E2fsprogs</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Procps dependency info -->
   <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
 
@@ -1478,15 +1534,15 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Util-linux-ng dependency info -->
-  <bridgehead renderas="sect2" id="util-linux-ng-dep">Util-linux-ng</bridgehead>
+<!-- Begin Util-linux dependency info -->
+  <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
-         Make, Ncurses, Sed, Texinfo et Zlib</seg>
+         Make, Ncurses, Pkg-config, Sed, Texinfo et Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1585,7 +1641,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>File, Module-Init-Tools et Util-linux-ng</seg>
+          <seg>File, Module-Init-Tools et Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 

Deleted: trunk/clfs/boot/64/util-linux-ng.xml
===================================================================
--- trunk/clfs/boot/64/util-linux-ng.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/64/util-linux-ng.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-boot-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>démarrage</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation d'Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>

Copied: trunk/clfs/boot/64/util-linux.xml (from rev 1258, trunk/clfs/boot/64/util-linux-ng.xml)
===================================================================
--- trunk/clfs/boot/64/util-linux.xml	                        (rev 0)
+++ trunk/clfs/boot/64/util-linux.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-boot-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <title>Util-linux-&util-linux-version;</title>
+
+  <indexterm zone="ch-boot-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+    <secondary>démarrage</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/util-linux.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation d'Util-linux-ng</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --enable-login-utils \
+    --disable-makeinstall-chown</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Les détails sur ce paquet sont situés dans <xref
+    linkend="contents-util-linux-ng" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/clfs/boot/alpha-chapter.xml
===================================================================
--- trunk/clfs/boot/alpha-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/alpha-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>

Deleted: trunk/clfs/boot/common/util-linux-ng.xml
===================================================================
--- trunk/clfs/boot/common/util-linux-ng.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/common/util-linux-ng.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-boot-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>démarrage</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation de Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
-  <para os="i">Copiez les bibliothèques et les includes dans /tools :</para>
-
-<screen os="j"><userinput>rm -fv ${CLFS}/usr/lib/lib{blkid,uuid}.la
-cp -v ${CLFS}/usr/lib/lib{blkid,uuid}* /tools/lib
-cp -v ${CLFS}/lib/lib{blkid,uuid}* /tools/lib
-ln -sfv libblkid.so.&util-linux-ng-blkid-id; /tools/lib/libblkid.so
-ln -sfv libuuid.so.&util-linux-ng-uuid-id; /tools/lib/libuuid.so
-install -dv /tools/include/{blkid,uuid}
-cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
-cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
-  
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>

Copied: trunk/clfs/boot/common/util-linux.xml (from rev 1258, trunk/clfs/boot/common/util-linux-ng.xml)
===================================================================
--- trunk/clfs/boot/common/util-linux.xml	                        (rev 0)
+++ trunk/clfs/boot/common/util-linux.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-boot-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <title>Util-linux-&util-linux-version;</title>
+
+  <indexterm zone="ch-boot-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+    <secondary>démarrage</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/util-linux.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation de Util-linux-ng</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>./configure --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --enable-login-utils \
+    --disable-makeinstall-chown</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>make</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+
+  <para os="i">Copiez les bibliothèques et les includes dans /tools :</para>
+
+<screen os="j"><userinput>rm -fv ${CLFS}/usr/lib/lib{blkid,uuid}.la
+cp -v ${CLFS}/usr/lib/lib{blkid,uuid}* /tools/lib
+cp -v ${CLFS}/lib/lib{blkid,uuid}* /tools/lib
+ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib/libblkid.so
+ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib/libuuid.so
+install -dv /tools/include/{blkid,uuid}
+cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
+cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
+  
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Les détails sur ce paquet sont situés dans <xref
+    linkend="contents-util-linux-ng" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/clfs/boot/mips-chapter.xml
===================================================================
--- trunk/clfs/boot/mips-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/mips-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -15,7 +15,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/bootloaders.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>

Modified: trunk/clfs/boot/mips64-64-chapter.xml
===================================================================
--- trunk/clfs/boot/mips64-64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/mips64-64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -15,7 +15,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/bootloaders.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>

Modified: trunk/clfs/boot/mips64-chapter.xml
===================================================================
--- trunk/clfs/boot/mips64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/mips64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -15,7 +15,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/bootloaders.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>

Deleted: trunk/clfs/boot/multilib/util-linux-ng.xml
===================================================================
--- trunk/clfs/boot/multilib/util-linux-ng.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/multilib/util-linux-ng.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-boot-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>démarrage</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --libdir=/lib64 --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>rm -fv ${CLFS}/usr/lib64/lib{blkid,uuid}.la
-cp -v ${CLFS}/usr/lib64/lib{blkid,uuid}* /tools/lib64
-cp -v ${CLFS}/lib64/lib{blkid,uuid}* /tools/lib64
-ln -sfv libblkid.so.&util-linux-ng-blkid-id; /tools/lib64/libblkid.so
-ln -sfv libuuid.so.&util-linux-ng-uuid-id; /tools/lib64/libuuid.so
-install -dv /tools/include/{blkid,uuid}
-cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
-cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont disponibles dans <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>

Copied: trunk/clfs/boot/multilib/util-linux.xml (from rev 1258, trunk/clfs/boot/multilib/util-linux-ng.xml)
===================================================================
--- trunk/clfs/boot/multilib/util-linux.xml	                        (rev 0)
+++ trunk/clfs/boot/multilib/util-linux.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-boot-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <title>Util-linux-&util-linux-version;</title>
+
+  <indexterm zone="ch-boot-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+    <secondary>démarrage</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/util-linux.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Util-linux-ng</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --libdir=/lib64 --enable-login-utils \
+    --disable-makeinstall-chown</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>rm -fv ${CLFS}/usr/lib64/lib{blkid,uuid}.la
+cp -v ${CLFS}/usr/lib64/lib{blkid,uuid}* /tools/lib64
+cp -v ${CLFS}/lib64/lib{blkid,uuid}* /tools/lib64
+ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib64/libblkid.so
+ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib64/libuuid.so
+install -dv /tools/include/{blkid,uuid}
+cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
+cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Les détails sur ce paquet sont disponibles dans <xref
+    linkend="contents-util-linux-ng" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/clfs/boot/ppc-chapter.xml
===================================================================
--- trunk/clfs/boot/ppc-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/ppc-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>

Modified: trunk/clfs/boot/ppc64-chapter.xml
===================================================================
--- trunk/clfs/boot/ppc64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/ppc64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>

Modified: trunk/clfs/boot/sparc-chapter.xml
===================================================================
--- trunk/clfs/boot/sparc-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/sparc-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>

Modified: trunk/clfs/boot/sparc64-64-chapter.xml
===================================================================
--- trunk/clfs/boot/sparc64-64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/sparc64-64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>

Modified: trunk/clfs/boot/sparc64-chapter.xml
===================================================================
--- trunk/clfs/boot/sparc64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/sparc64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>

Modified: trunk/clfs/boot/x86-chapter.xml
===================================================================
--- trunk/clfs/boot/x86-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/x86-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>

Modified: trunk/clfs/boot/x86_64-64-chapter.xml
===================================================================
--- trunk/clfs/boot/x86_64-64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/x86_64-64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>

Modified: trunk/clfs/boot/x86_64-chapter.xml
===================================================================
--- trunk/clfs/boot/x86_64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/boot/x86_64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/> 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/> 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>

Modified: trunk/clfs/chroot/alpha-chapter.xml
===================================================================
--- trunk/clfs/chroot/alpha-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/alpha-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Deleted: trunk/clfs/chroot/common/util-linux-ng.xml
===================================================================
--- trunk/clfs/chroot/common/util-linux-ng.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/common/util-linux-ng.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-chroot-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>chroot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation de Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-makeinstall-chown</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>

Copied: trunk/clfs/chroot/common/util-linux.xml (from rev 1258, trunk/clfs/chroot/common/util-linux-ng.xml)
===================================================================
--- trunk/clfs/chroot/common/util-linux.xml	                        (rev 0)
+++ trunk/clfs/chroot/common/util-linux.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-chroot-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <title>Util-linux-&util-linux-version;</title>
+
+  <indexterm zone="ch-chroot-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+    <secondary>chroot</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/util-linux.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation de Util-linux</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>./configure --prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --disable-makeinstall-chown</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>make</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Les détails sur ce paquet sont situés dans <xref
+    linkend="contents-util-linux-ng" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/clfs/chroot/mips-chapter.xml
===================================================================
--- trunk/clfs/chroot/mips-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/mips-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/before-chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>

Modified: trunk/clfs/chroot/mips64-64-chapter.xml
===================================================================
--- trunk/clfs/chroot/mips64-64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/mips64-64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Modified: trunk/clfs/chroot/mips64-chapter.xml
===================================================================
--- trunk/clfs/chroot/mips64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/mips64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Deleted: trunk/clfs/chroot/multilib/util-linux-ng.xml
===================================================================
--- trunk/clfs/chroot/multilib/util-linux-ng.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/multilib/util-linux-ng.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-chroot-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>chroot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation de Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-makeinstall-chown</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>

Copied: trunk/clfs/chroot/multilib/util-linux.xml (from rev 1258, trunk/clfs/chroot/multilib/util-linux-ng.xml)
===================================================================
--- trunk/clfs/chroot/multilib/util-linux.xml	                        (rev 0)
+++ trunk/clfs/chroot/multilib/util-linux.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-chroot-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <title>Util-linux-&util-linux-version;</title>
+
+  <indexterm zone="ch-chroot-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+    <secondary>chroot</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/util-linux.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation de Util-linux-ng</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --disable-makeinstall-chown</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Les détails sur ce paquet sont situés dans <xref
+    linkend="contents-util-linux-ng" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/clfs/chroot/ppc-chapter.xml
===================================================================
--- trunk/clfs/chroot/ppc-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/ppc-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/before-chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>

Modified: trunk/clfs/chroot/ppc64-chapter.xml
===================================================================
--- trunk/clfs/chroot/ppc64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/ppc64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Modified: trunk/clfs/chroot/sparc-chapter.xml
===================================================================
--- trunk/clfs/chroot/sparc-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/sparc-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/before-chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>

Modified: trunk/clfs/chroot/sparc64-64-chapter.xml
===================================================================
--- trunk/clfs/chroot/sparc64-64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/sparc64-64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Modified: trunk/clfs/chroot/sparc64-chapter.xml
===================================================================
--- trunk/clfs/chroot/sparc64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/sparc64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Modified: trunk/clfs/chroot/x86-chapter.xml
===================================================================
--- trunk/clfs/chroot/x86-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/x86-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/before-chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>

Modified: trunk/clfs/chroot/x86_64-64-chapter.xml
===================================================================
--- trunk/clfs/chroot/x86_64-64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/x86_64-64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>Si vous allez vous chrooter</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Modified: trunk/clfs/chroot/x86_64-chapter.xml
===================================================================
--- trunk/clfs/chroot/x86_64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/chroot/x86_64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -12,7 +12,7 @@
   <title>Si vous allez vous chrooter</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Modified: trunk/clfs/final-system/alpha-chapter.xml
===================================================================
--- trunk/clfs/final-system/alpha-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/alpha-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -29,7 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>

Modified: trunk/clfs/final-system/common/e2fsprogs.xml
===================================================================
--- trunk/clfs/final-system/common/e2fsprogs.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/common/e2fsprogs.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -34,7 +34,7 @@
 
     <para os="c">Préparez la compilation d'E2fsprogs :</para>
 
-<screen os="d"><userinput>PKG_CONFIG=true ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>
@@ -70,8 +70,7 @@
 
     <para os="f">Compilez le paquet :</para>
 
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
-    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
 
     <para os="h">Pour tester les résultats, exécutez :
     <userinput>make check</userinput>.</para>

Added: trunk/clfs/final-system/common/pkg-config.xml
===================================================================
--- trunk/clfs/final-system/common/pkg-config.xml	                        (rev 0)
+++ trunk/clfs/final-system/common/pkg-config.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-pkg-config" role="wrap">
+  <?dbhtml filename="pkg-config.html"?>
+
+  <title>Pkg-config-&pkg-config-version;</title>
+
+  <indexterm zone="ch-system-pkg-config">
+    <primary sortas="a-Pkg-config">Pkg-config</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Pkg-config est un outil pour vous aider à insérer les bonnes options
+    du compilateur sur la ligne de commande lors de la compilation d'applications
+    et de bibliothèques.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation de Pkg-config</title>
+
+    <para os="a">Préparez la compilation de Pkg-config :</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para os="c">Compilez le paquet :</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">Pour tester les résultats, effectuez :
+    <userinput>make check</userinput>.</para>
+
+    <para os="f">Installez le paquet :</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-pkg-config" role="content">
+    <title>Contenu de Pkg-config</title>
+
+    <segmentedlist>
+      <segtitle>Programmes installés</segtitle>
+      <segtitle>Répertoire installé</segtitle>
+
+      <seglistitem>
+        <seg>pkg-config</seg>
+        <seg>/usr/share/doc/pkg-config</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pkg-config">
+        <term><command>pkg-config</command></term>
+        <listitem>
+          <para>Le programme <command>pkg-config</command> est utilisé pour
+          récupérer des informations sur les bibliothèques installées dans le 
+          système. On l'utilise en général pour compiler et lier à une ou 
+          plusieurs bibliothèques.</para>
+          <indexterm zone="ch-system-pkg-config pkg-config">
+            <primary sortas="b-pkg-config">pkg-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+</sect1>
+

Modified: trunk/clfs/final-system/common/procps.xml
===================================================================
--- trunk/clfs/final-system/common/procps.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/common/procps.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -24,6 +24,12 @@
 
   <sect2 role="installation">
     <title>Installation de Procps</title>
+
+    <para os="p1">Le correctif suivant ajoute le support des groupes de
+    contrôle des processus à ps :</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&procps-ps_cgroup-patch;</userinput></screen>
+
     <para os="s1">Ce qui suit corrige un problème avec Make 3.82 :</para>
 
 <screen os="s2"><userinput>sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' Makefile</userinput></screen>

Deleted: trunk/clfs/final-system/common/util-linux-ng.xml
===================================================================
--- trunk/clfs/final-system/common/util-linux-ng.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/common/util-linux-ng.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -1,916 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-system-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Le paquet Util-linux-ng contient différents outils. Parmi eux se
-    trouvent des outils de gestion des systèmes de fichiers, de
-    consoles, de partitions et des messages.</para>
-
-  </sect2>
-
-  <sect2 id="fhs-util-linux-ng" role="installation">
-    <title>Notes de compatibilité FHS</title>
-
-    <para>Le FHS recommande d'utiliser le répertoire
-    <filename class="directory">/var/lib/hwclock</filename> au lieu de
-    l'habituel <filename class="directory">/etc</filename> comme
-    emplacement du fichier <filename>adjtime</filename>. Pour rendre 
-    <command>hwclock</command> compatible avec le FHS, lancez ce qui
-    suit :</para>
-
-<screen><userinput>sed -i 's at etc/adjtime at var/lib/hwclock/adjtime at g' \
-    hwclock/hwclock.c
-mkdir -pv /var/lib/hwclock</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation de Util-linux-ng</title>
-
-    <para os="a">Préparez la compilation d'Util-linux-ng :</para>
-
-<screen os="b"><userinput>./configure --enable-arch \
-    --enable-partx --enable-write --disable-wall</userinput></screen>
-
-    <variablelist os="c">
-      <title>Voici la signification des options de configure :</title>
-
-    <varlistentry>
-      <term><parameter>--enable-partx</parameter></term>
-      <listitem>
-          <para>Active partx (il faut plus de description).</para>
-      </listitem>
-    </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-wall</parameter></term>
-        <listitem>
-          <para>Désactive la construction du programme <command>wall</command> puisque le paquet Sysvinit installe sa propre 
-          version.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-write</parameter></term>
-        <listitem>
-          <para>Cette option permet au programme <command>write</command> d'être installé.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  
-    <para os="d">Compilez le paquet :</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">Ce paquet ne fournit pas de suite de tests.</para>
-
-    <para os="g">Installez le paquet :</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Déplacez le binaire <command>logger</command> vers
-    <filename class="directory">/bin</filename> selon le besoin du paquet CLFS-Bootscripts :</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-util-linux-ng" role="content">
-    <title>Contenu de Util-linux-ng</title>
-
-    <segmentedlist>
-      <segtitle>Programmes installés</segtitle>
-      <segtitle>Bibliothèques installées</segtitle>
-      <segtitle>Répertoires installés</segtitle>
-
-      <seglistitem>
-        <seg>addpart, agetty, arch, blkid, blockdev, cal, cfdisk, chkdupexe,
-        chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, ddate, delpart,
-        dmesg, fdformat, fdisk, findfs, flock, fsck, fsck.cramfs, fsck.minix,
-        getopt, hexdump, hwclock, ionice, ipcmk, ipcrm, ipcs, isosize,
-        ldattach, line, logger, look, losetup, lscpu, mcookie, mkfs, mkfs.bfs,
-        mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, partx, pg,
-        pivot_root, readprofile, rename, renice, rev, rtcwake, script,
-        scriptreplay, setarch, setsid, setterm, sfdisk, swapoff (lien vers
-        swapon), swapon, switch_root, tailf, taskset, tunelp, ul, umount,
-        uuidd, uuidgen, whereis et write</seg>
-        <seg>libblkid.[a,so] et libuuid.[a,so]</seg>
-        <seg>/usr/include/blkid, /usr/include/uuid, /usr/share/getopt,
-        /var/lib/hwclock</seg>
-
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addpart">
-        <term><command>addpart</command></term>
-        <listitem>
-          <para>Informe le noyau de nouvelles partitions</para>
-          <indexterm zone="ch-system-util-linux-ng addpart">
-            <primary sortas="b-addpart">addpart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="agetty">
-        <term><command>agetty</command></term>
-        <listitem>
-          <para>Ouvre un port tty, demande un nom de connexion puis appelle le programme
-          <command>login</command></para>
-          <indexterm zone="ch-system-util-linux-ng agetty">
-            <primary sortas="b-agetty">agetty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="arch">
-        <term><command>arch</command></term>
-        <listitem>
-          <para>Signale l'architecture de la machine</para>
-          <indexterm zone="ch-system-util-linux-ng arch">
-            <primary sortas="b-arch">arch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="blkid">
-        <term><command>blkid</command></term>
-        <listitem>
-          <para>A command line utility to locate and print block device
-          attributes</para>
-          <indexterm zone="ch-system-util-linux-ng blkid">
-            <primary sortas="b-blkid">blkid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blockdev">
-        <term><command>blockdev</command></term>
-        <listitem>
-          <para>Permet aux utilisateurs d'appeler les ioctl d'un périphérique bloc à
-          partir de la ligne de commande</para>
-          <indexterm zone="ch-system-util-linux-ng blockdev">
-            <primary sortas="b-blockdev">blockdev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cal">
-        <term><command>cal</command></term>
-        <listitem>
-          <para>Affiche un calendrier simple</para>
-          <indexterm zone="ch-system-util-linux-ng cal">
-            <primary sortas="b-cal">cal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cfdisk">
-        <term><command>cfdisk</command></term>
-        <listitem>
-          <para>Manipule la table des partitions du périphérique donné</para>
-          <indexterm zone="ch-system-util-linux-ng cfdisk">
-            <primary sortas="b-cfdisk">cfdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chkdupexe">
-        <term><command>chkdupexe</command></term>
-        <listitem>
-          <para>Trouve les exécutables dupliqués</para>
-          <indexterm zone="ch-system-util-linux-ng chkdupexe">
-            <primary sortas="b-chkdupexe">chkdupexe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chrt">
-        <term><command>chrt</command></term>
-        <listitem>
-          <para>Manipule les attributs d'un processus en temps réel</para>
-          <indexterm zone="ch-system-util-linux-ng chrt">
-            <primary sortas="b-chrt">chrt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="col">
-        <term><command>col</command></term>
-        <listitem>
-          <para>Filtre les retours chariot inversés</para>
-          <indexterm zone="ch-system-util-linux-ng col">
-            <primary sortas="b-col">col</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colcrt">
-        <term><command>colcrt</command></term>
-        <listitem>
-          <para>Filtre la sortie de <command>nroff</command> pour les terminaux manquant
-          de capacités comme le texte barré ou les demi-lignes</para>
-          <indexterm zone="ch-system-util-linux-ng colcrt">
-            <primary sortas="b-colcrt">colcrt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colrm">
-        <term><command>colrm</command></term>
-        <listitem>
-          <para>Filtre les colonnes données</para>
-          <indexterm zone="ch-system-util-linux-ng colrm">
-            <primary sortas="b-colrm">colrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="column">
-        <term><command>column</command></term>
-        <listitem>
-          <para>Formate un fichier donné en plusieurs colonnes</para>
-          <indexterm zone="ch-system-util-linux-ng column">
-            <primary sortas="b-column">column</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ctrlaltdel">
-        <term><command>ctrlaltdel</command></term>
-        <listitem>
-          <para>Initialise la combinaison des touches Ctrl+Alt+Del pour une
-          réinitialisation matérielle ou logicielle</para>
-          <indexterm zone="ch-system-util-linux-ng ctrlaltdel">
-            <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cytune">
-        <term><command>cytune</command></term>
-        <listitem>
-          <para>Est utilisé pour paramétrer finement les pilotes de lignes séries des
-          cartes Cyclades</para>
-          <indexterm zone="ch-system-util-linux-ng cytune">
-            <primary sortas="b-cytune">cytune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ddate">
-        <term><command>ddate</command></term>
-        <listitem>
-          <para>Donne la date discordienne ou convertit la date grégorienne en une date
-          discordienne</para>
-          <indexterm zone="ch-system-util-linux-ng ddate">
-            <primary sortas="b-ddate">ddate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="delpart">
-        <term><command>delpart</command></term>
-        <listitem>
-          <para>Demande au noyau de supprimer une partition</para>
-          <indexterm zone="ch-system-util-linux-ng delpart">
-            <primary sortas="b-delpart">delpart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="dmesg">
-        <term><command>dmesg</command></term>
-        <listitem>
-          <para>Affiche les messages du noyau lors du démarrage</para>
-          <indexterm zone="ch-system-util-linux-ng dmesg">
-            <primary sortas="b-dmesg">dmesg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="fdformat">
-        <term><command>fdformat</command></term>
-        <listitem>
-          <para>Réalise un formatage de bas niveau sur un disque amovible</para>
-          <indexterm zone="ch-system-util-linux-ng fdformat">
-            <primary sortas="b-fdformat">fdformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdisk">
-        <term><command>fdisk</command></term>
-        <listitem>
-          <para>Est utilisé pour manipuler la table de partitions du périphérique
-          donné</para>
-          <indexterm zone="ch-system-util-linux-ng fdisk">
-            <primary sortas="b-fdisk">fdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="findfs">
-        <term><command>findfs</command></term>
-        <listitem>
-          <para>Finds a file system by label or Universally Unique Identifier
-          (UUID)</para>
-          <indexterm zone="ch-system-util-linux-ng findfs">
-            <primary sortas="b-findfs">findfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="flock">
-        <term><command>flock</command></term>
-        <listitem>
-          <para>Acquiert le verrouillage d'un fichier puis exécute 
-          une commande en maintenant le verrouillage</para>
-          <indexterm zone="ch-system-util-linux-ng flock">
-            <primary sortas="b-flock">flock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck">
-        <term><command>fsck</command></term>
-        <listitem>
-          <para>Est utilisé pour vérifier, et parfois réparer, les systèmes de
-          fichiers</para>
-          <indexterm zone="ch-system-util-linux-ng fsck">
-            <primary sortas="b-fsck">fsck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.cramfs">
-        <term><command>fsck.cramfs</command></term>
-        <listitem>
-          <para>Réalise un test de cohérence sur le système de fichiers Cramfs 
-          du périphérique donné</para>
-          <indexterm zone="ch-system-util-linux-ng fsck.cramfs">
-            <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.minix">
-        <term><command>fsck.minix</command></term>
-        <listitem>
-          <para>Réalise un test de cohérence sur le système de fichiers Minix du
-          périphérique donné</para>
-          <indexterm zone="ch-system-util-linux-ng fsck.minix">
-            <primary sortas="b-fsck.minix">fsck.minix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getopt">
-        <term><command>getopt</command></term>
-        <listitem>
-          <para>Analyse les options sur la ligne de commande donnée</para>
-          <indexterm zone="ch-system-util-linux-ng getopt">
-            <primary sortas="b-getopt">getopt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hexdump">
-        <term><command>hexdump</command></term>
-        <listitem>
-          <para>Affiche le fichier indiqué en hexadécimal ou dans un autre format
-          donné</para>
-          <indexterm zone="ch-system-util-linux-ng hexdump">
-            <primary sortas="b-hexdump">hexdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hwclock">
-        <term><command>hwclock</command></term>
-        <listitem>
-          <para>Lit ou initialise l'horloge matériel, aussi appelée horloge RTC
-          (<foreignphrase>Real-Time Clock</foreignphrase>, horloge à temps réel) ou
-          horloge BIOS (<foreignphrase>Basic Input-Output System</foreignphrase>)</para>
-          <indexterm zone="ch-system-util-linux-ng hwclock">
-            <primary sortas="b-hwclock">hwclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="ionice">
-        <term><command>ionice</command></term>
-        <listitem>
-          <para>Donne ou initialise la classe de planification IO (ES) et la 
-          priorité pour un programme</para>
-          <indexterm zone="ch-system-util-linux-ng ionice">
-            <primary sortas="b-ionice">ionice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>     
-
-      <varlistentry id="ipcmk">
-        <term><command>ipcmk</command></term>
-        <listitem>
-          <para>Crée diverses ressources IPC</para>
-          <indexterm zone="ch-system-util-linux-ng ipcmk">
-            <primary sortas="b-ipcmk">ipcmk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipcrm">
-        <term><command>ipcrm</command></term>
-        <listitem>
-          <para>Supprime la ressource IPC (inter-process communication) donnée</para>
-          <indexterm zone="ch-system-util-linux-ng ipcrm">
-            <primary sortas="b-ipcrm">ipcrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipcs">
-        <term><command>ipcs</command></term>
-        <listitem>
-          <para>Fournit l'information de statut IPC</para>
-          <indexterm zone="ch-system-util-linux-ng ipcs">
-            <primary sortas="b-ipcs">ipcs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isosize">
-        <term><command>isosize</command></term>
-        <listitem>
-          <para>Affiche la taille d'un système de fichiers iso9660</para>
-          <indexterm zone="ch-system-util-linux-ng isosize">
-            <primary sortas="b-isosize">isosize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="ldattach">
-        <term><command>ldattach</command></term>
-        <listitem>
-          <para>Attache une ligne de discipline à une ligne en série.</para>
-          <indexterm zone="ch-system-util-linux-ng ldattach">
-            <primary sortas="b-ldattach">ldattach</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="line">
-        <term><command>line</command></term>
-        <listitem>
-          <para>Copie une simple ligne</para>
-          <indexterm zone="ch-system-util-linux-ng line">
-            <primary sortas="b-line">line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logger">
-        <term><command>logger</command></term>
-        <listitem>
-          <para>Enregistre le message donné dans les traces système</para>
-          <indexterm zone="ch-system-util-linux-ng logger">
-            <primary sortas="b-logger">logger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="look">
-        <term><command>look</command></term>
-        <listitem>
-          <para>Affiche les lignes commençant avec la chaîne donnée</para>
-          <indexterm zone="ch-system-util-linux-ng look">
-            <primary sortas="b-look">look</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="losetup">
-        <term><command>losetup</command></term>
-        <listitem>
-          <para>Initialise et contrôle les périphériques loop</para>
-          <indexterm zone="ch-system-util-linux-ng losetup">
-            <primary sortas="b-losetup">losetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="lscpu">
-        <term><command>lscpu</command></term>
-        <listitem>
-          <para>Affiche des informations sur l'architechture du processeur</para>
-          <indexterm zone="ch-system-util-linux-ng lscpu">
-            <primary sortas="b-lscpu">lscpu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcookie">
-        <term><command>mcookie</command></term>
-        <listitem>
-          <para>Génère des cookies magiques, nombres hexadécimaux aléatoires sur 128
-          bits, pour <command>xauth</command></para>
-          <indexterm zone="ch-system-util-linux-ng mcookie">
-            <primary sortas="b-mcookie">mcookie</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs">
-        <term><command>mkfs</command></term>
-        <listitem>
-          <para>Construit un système de fichiers sur un périphérique (habituellement une
-          partition du disque dur)</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs">
-            <primary sortas="b-mkfs">mkfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.bfs">
-        <term><command>mkfs.bfs</command></term>
-        <listitem>
-          <para>Crée un système de fichiers bfs de SCO (Santa Cruz Operations)</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs.bfs">
-            <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.cramfs">
-        <term><command>mkfs.cramfs</command></term>
-        <listitem>
-          <para>Crée un système de fichiers cramfs</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs.cramfs">
-            <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.minix">
-        <term><command>mkfs.minix</command></term>
-        <listitem>
-          <para>Crée un système de fichiers Minix</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs.minix">
-            <primary sortas="b-mkfs.minix">mkfs.minix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkswap">
-        <term><command>mkswap</command></term>
-        <listitem>
-          <para>Initialise le périphérique ou le fichier à utiliser comme swap</para>
-          <indexterm zone="ch-system-util-linux-ng mkswap">
-            <primary sortas="b-mkswap">mkswap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="more">
-        <term><command>more</command></term>
-        <listitem>
-          <para>Est un filtre pour visualiser un texte un écran à la fois</para>
-          <indexterm zone="ch-system-util-linux-ng more">
-            <primary sortas="b-more">more</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount">
-        <term><command>mount</command></term>
-        <listitem>
-          <para>Attache le système de fichiers du périphérique donné sur un répertoire
-          spécifié dans le système de fichiers</para>
-          <indexterm zone="ch-system-util-linux-ng mount">
-            <primary sortas="b-mount">mount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="namei">
-        <term><command>namei</command></term>
-        <listitem>
-          <para>Affiche les liens symboliques dans les chemins donnés</para>
-          <indexterm zone="ch-system-util-linux-ng namei">
-            <primary sortas="b-namei">namei</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="partx">
-        <term><command>partx</command></term>
-        <listitem>
-          <para>Signale au noyau la présence et le nombre de partitions sur un
-          disque</para>
-          <indexterm zone="ch-system-util-linux-ng partx">
-            <primary sortas="b-partx">partx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="pg">
-        <term><command>pg</command></term>
-        <listitem>
-          <para>Affiche un fichier texte un écran à la fois</para>
-          <indexterm zone="ch-system-util-linux-ng pg">
-            <primary sortas="b-pg">pg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pivot_root">
-        <term><command>pivot_root</command></term>
-        <listitem>
-          <para>Fait en sorte que le système de fichiers donné soit le nouveau système de
-          fichiers racine du processus actuel</para>
-          <indexterm zone="ch-system-util-linux-ng pivot_root">
-            <primary sortas="b-pivot_root">pivot_root</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readprofile">
-        <term><command>readprofile</command></term>
-        <listitem>
-          <para>>Lit les informations de profilage du noyau</para>
-          <indexterm zone="ch-system-util-linux-ng readprofile">
-            <primary sortas="b-readprofile">readprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rename">
-        <term><command>rename</command></term>
-        <listitem>
-          <para>Renomme les fichiers donnés, remplaçant une chaîne donnée par une
-          autre</para>
-          <indexterm zone="ch-system-util-linux-ng rename">
-            <primary sortas="b-rename">rename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="renice">
-        <term><command>renice</command></term>
-        <listitem>
-          <para>Modifie la priorité des processus exécutés</para>
-          <indexterm zone="ch-system-util-linux-ng renice">
-            <primary sortas="b-renice">renice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rev">
-        <term><command>rev</command></term>
-        <listitem>
-          <para>Inverse les lignes d'un fichier donné</para>
-          <indexterm zone="ch-system-util-linux-ng rev">
-            <primary sortas="b-rev">rev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtcwake">
-        <term><command>rtcwake</command></term>
-        <listitem>
-          <para>Met un système en sommeil jusqu'à un moment
-          de réveil spécifié</para>
-          <indexterm zone="ch-system-util-linux-ng rtcwake">
-            <primary sortas="b-rtcwake">rtcwake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> 
-      <varlistentry id="script">
-        <term><command>script</command></term>
-        <listitem>
-          <para>Crée une transcription de session du terminal à partir de tout ce qui est
-          affiché sur un terminal</para>
-          <indexterm zone="ch-system-util-linux-ng script">
-            <primary sortas="b-script">script</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scriptreplay">
-        <term><command>scriptreplay</command></term>
-        <listitem>
-          <para>Rejoue une transcription créée par <command>script</command></para>
-          <indexterm zone="ch-system-util-linux-ng scriptreplay">
-            <primary sortas="b-scriptreplay">scriptreplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="setarch">
-        <term><command>setarch</command></term>
-        <listitem>
-          <para>Change d'architecture signalée dans un nouvel environnement de
-          programme et initialise les commutateurs de personnalité</para>
-          <indexterm zone="ch-system-util-linux-ng setarch">
-            <primary sortas="b-setarch">setarch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="setsid">
-        <term><command>setsid</command></term>
-        <listitem>
-          <para>Lance le programme donné dans une nouvelle session</para>
-          <indexterm zone="ch-system-util-linux-ng setsid">
-            <primary sortas="b-setsid">setsid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setterm">
-        <term><command>setterm</command></term>
-        <listitem>
-          <para>Initialise les attributs du terminal</para>
-          <indexterm zone="ch-system-util-linux-ng setterm">
-            <primary sortas="b-setterm">setterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfdisk">
-        <term><command>sfdisk</command></term>
-        <listitem>
-          <para>Un manipulateur de table de partitions disque</para>
-          <indexterm zone="ch-system-util-linux-ng sfdisk">
-            <primary sortas="b-sfdisk">sfdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="swapoff">
-        <term><command>swapoff</command></term>
-        <listitem>
-          <para>Désactive les périphériques et fichiers de pagination et d'échange.</para>
-
-          <indexterm zone="ch-system-util-linux-ng swapoff">
-            <primary sortas="b-swapoff">swapoff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="swapon">
-        <term><command>swapon</command></term>
-        <listitem>
-          <para>Active les périphériques et fichiers de pagination et d'échange, 
-          et liste les périphériques et fichiers en cours d'utilisation.</para>
-          <indexterm zone="ch-system-util-linux-ng swapon">
-            <primary sortas="b-swapon">swapon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="switch_root">
-        <term><command>switch_root</command></term>
-        <listitem>
-          <para>Change vers un autre système de fichiers pour racine de l'arborescence montée</para>
-          <indexterm zone="ch-system-util-linux-ng switch_root">
-            <primary sortas="b-switch_root">switch_root</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tailf">
-        <term><command>tailf</command></term>
-        <listitem>
-          <para>Observe la croissance d'un fichier journal. Affiche les 10 
-          dernières lignes d'un fichier journal, puis continue à afficher toute
-          nouvelle entrée dans le fichier journal dès qu'elle est créée</para>
-          <indexterm zone="ch-system-util-linux-ng tailf">
-            <primary sortas="b-tailf">tailf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="taskset">
-        <term><command>taskset</command></term>
-        <listitem>
-          <para>Récupère ou initialise l'affinité processeur du processus</para>
-          <indexterm zone="ch-system-util-linux-ng taskset">
-            <primary sortas="b-taskset">taskset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="tunelp">
-        <term><command>tunelp</command></term>
-        <listitem>
-          <para>Est utilisé pour paramétrer finement une imprimante ligne</para>
-          <indexterm zone="ch-system-util-linux-ng tunelp">
-            <primary sortas="b-tunelp">tunelp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ul">
-        <term><command>ul</command></term>
-        <listitem>
-          <para>Un filtre pour traduire les soulignements en séquences d'échappement
-          indiquant un soulignement pour le terminal utilisé</para>
-          <indexterm zone="ch-system-util-linux-ng ul">
-            <primary sortas="b-ul">ul</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umount">
-        <term><command>umount</command></term>
-        <listitem>
-          <para>Déconnecte un système de fichiers à partir de la hiérarchie de fichiers
-          du système</para>
-          <indexterm zone="ch-system-util-linux-ng umount">
-            <primary sortas="b-umount">umount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="uuidd">
-        <term><command>uuidd</command></term>
-        <listitem>
-          <para>Un démon utilisé par la bibliothèque UUID pour générer des UUIDs
-          basés sur l'heure de manière sécurisée et avec une garantie unique.</para>
-          <indexterm zone="ch-system-util-linux-ng uuidd">
-            <primary sortas="b-uuidd">uuidd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuidgen">
-        <term><command>uuidgen</command></term>
-        <listitem>
-          <para>Crée un nouvel UUID. Chaque nouvel UUID peut être raisonnablement
-          considéré unique parmi tous les UUID créés, sur le système local mais aussi sur
-          les autres, dans le passé et dans le futur.</para>
-          <indexterm zone="ch-system-util-linux-ng uuidgen">
-            <primary sortas="b-uuidgen">uuidgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="whereis">
-        <term><command>whereis</command></term>
-        <listitem>
-          <para>Affiche l'emplacement du binaire, les sources et la page de manuel de la
-          commande donnée</para>
-          <indexterm zone="ch-system-util-linux-ng whereis">
-            <primary sortas="b-whereis">whereis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write">
-        <term><command>write</command></term>
-        <listitem>
-          <para>Envoie un message à l'utilisateur donné <emphasis>sauf si</emphasis>
-          l'utilisateur a désactivé de tels messages</para>
-          <indexterm zone="ch-system-util-linux-ng write">
-            <primary sortas="b-write">write</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libblkid">
-        <term><filename class="libraryfile">libblkid</filename></term>
-        <listitem>
-          <para>Contient des routines pour l'identification de processus et l'extraction
-          de jetons</para>
-          <indexterm zone="ch-system-util-linux-ng libblkid">
-            <primary sortas="c-libblkid">libblkid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libuuid">
-        <term><filename class="libraryfile">libuuid</filename></term>
-        <listitem>
-          <para>Contient des routines pour générer des identifieurs uniques pour les
-          objets qui pourraient être accessibles en dehors du système local</para>
-          <indexterm zone="ch-system-util-linux-ng libuuid">
-            <primary sortas="c-libuuid">libuuid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
-

Copied: trunk/clfs/final-system/common/util-linux.xml (from rev 1258, trunk/clfs/final-system/common/util-linux-ng.xml)
===================================================================
--- trunk/clfs/final-system/common/util-linux.xml	                        (rev 0)
+++ trunk/clfs/final-system/common/util-linux.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,916 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <title>Util-linux-&util-linux-version;</title>
+
+  <indexterm zone="ch-system-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Le paquet Util-linux-ng contient différents outils. Parmi eux se
+    trouvent des outils de gestion des systèmes de fichiers, de
+    consoles, de partitions et des messages.</para>
+
+  </sect2>
+
+  <sect2 id="fhs-util-linux-ng" role="installation">
+    <title>Notes de compatibilité FHS</title>
+
+    <para>Le FHS recommande d'utiliser le répertoire
+    <filename class="directory">/var/lib/hwclock</filename> au lieu de
+    l'habituel <filename class="directory">/etc</filename> comme
+    emplacement du fichier <filename>adjtime</filename>. Pour rendre 
+    <command>hwclock</command> compatible avec le FHS, lancez ce qui
+    suit :</para>
+
+<screen><userinput>sed -i 's at etc/adjtime at var/lib/hwclock/adjtime at g' \
+    hwclock/hwclock.c
+mkdir -pv /var/lib/hwclock</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation de Util-linux-ng</title>
+
+    <para os="a">Préparez la compilation d'Util-linux-ng :</para>
+
+<screen os="b"><userinput>./configure --enable-arch \
+    --enable-partx --enable-write --disable-wall</userinput></screen>
+
+    <variablelist os="c">
+      <title>Voici la signification des options de configure :</title>
+
+    <varlistentry>
+      <term><parameter>--enable-partx</parameter></term>
+      <listitem>
+          <para>Active partx (il faut plus de description).</para>
+      </listitem>
+    </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-wall</parameter></term>
+        <listitem>
+          <para>Désactive la construction du programme <command>wall</command> puisque le paquet Sysvinit installe sa propre 
+          version.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-write</parameter></term>
+        <listitem>
+          <para>Cette option permet au programme <command>write</command> d'être installé.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  
+    <para os="d">Compilez le paquet :</para>
+
+<screen os="e"><userinput>make</userinput></screen>
+
+    <para os="f">Ce paquet ne fournit pas de suite de tests.</para>
+
+    <para os="g">Installez le paquet :</para>
+
+<screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="i">Déplacez le binaire <command>logger</command> vers
+    <filename class="directory">/bin</filename> selon le besoin du paquet CLFS-Bootscripts :</para>
+
+<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-util-linux-ng" role="content">
+    <title>Contenu de Util-linux-ng</title>
+
+    <segmentedlist>
+      <segtitle>Programmes installés</segtitle>
+      <segtitle>Bibliothèques installées</segtitle>
+      <segtitle>Répertoires installés</segtitle>
+
+      <seglistitem>
+        <seg>addpart, agetty, arch, blkid, blockdev, cal, cfdisk, chkdupexe,
+        chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, ddate, delpart,
+        dmesg, fdformat, fdisk, findfs, flock, fsck, fsck.cramfs, fsck.minix,
+        getopt, hexdump, hwclock, ionice, ipcmk, ipcrm, ipcs, isosize,
+        ldattach, line, logger, look, losetup, lscpu, mcookie, mkfs, mkfs.bfs,
+        mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, partx, pg,
+        pivot_root, readprofile, rename, renice, rev, rtcwake, script,
+        scriptreplay, setarch, setsid, setterm, sfdisk, swapoff (lien vers
+        swapon), swapon, switch_root, tailf, taskset, tunelp, ul, umount,
+        uuidd, uuidgen, whereis et write</seg>
+        <seg>libblkid.[a,so] et libuuid.[a,so]</seg>
+        <seg>/usr/include/blkid, /usr/include/uuid, /usr/share/getopt,
+        /var/lib/hwclock</seg>
+
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Descriptions courtes</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="addpart">
+        <term><command>addpart</command></term>
+        <listitem>
+          <para>Informe le noyau de nouvelles partitions</para>
+          <indexterm zone="ch-system-util-linux-ng addpart">
+            <primary sortas="b-addpart">addpart</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="agetty">
+        <term><command>agetty</command></term>
+        <listitem>
+          <para>Ouvre un port tty, demande un nom de connexion puis appelle le programme
+          <command>login</command></para>
+          <indexterm zone="ch-system-util-linux-ng agetty">
+            <primary sortas="b-agetty">agetty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="arch">
+        <term><command>arch</command></term>
+        <listitem>
+          <para>Signale l'architecture de la machine</para>
+          <indexterm zone="ch-system-util-linux-ng arch">
+            <primary sortas="b-arch">arch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="blkid">
+        <term><command>blkid</command></term>
+        <listitem>
+          <para>A command line utility to locate and print block device
+          attributes</para>
+          <indexterm zone="ch-system-util-linux-ng blkid">
+            <primary sortas="b-blkid">blkid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="blockdev">
+        <term><command>blockdev</command></term>
+        <listitem>
+          <para>Permet aux utilisateurs d'appeler les ioctl d'un périphérique bloc à
+          partir de la ligne de commande</para>
+          <indexterm zone="ch-system-util-linux-ng blockdev">
+            <primary sortas="b-blockdev">blockdev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cal">
+        <term><command>cal</command></term>
+        <listitem>
+          <para>Affiche un calendrier simple</para>
+          <indexterm zone="ch-system-util-linux-ng cal">
+            <primary sortas="b-cal">cal</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cfdisk">
+        <term><command>cfdisk</command></term>
+        <listitem>
+          <para>Manipule la table des partitions du périphérique donné</para>
+          <indexterm zone="ch-system-util-linux-ng cfdisk">
+            <primary sortas="b-cfdisk">cfdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="chkdupexe">
+        <term><command>chkdupexe</command></term>
+        <listitem>
+          <para>Trouve les exécutables dupliqués</para>
+          <indexterm zone="ch-system-util-linux-ng chkdupexe">
+            <primary sortas="b-chkdupexe">chkdupexe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="chrt">
+        <term><command>chrt</command></term>
+        <listitem>
+          <para>Manipule les attributs d'un processus en temps réel</para>
+          <indexterm zone="ch-system-util-linux-ng chrt">
+            <primary sortas="b-chrt">chrt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="col">
+        <term><command>col</command></term>
+        <listitem>
+          <para>Filtre les retours chariot inversés</para>
+          <indexterm zone="ch-system-util-linux-ng col">
+            <primary sortas="b-col">col</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="colcrt">
+        <term><command>colcrt</command></term>
+        <listitem>
+          <para>Filtre la sortie de <command>nroff</command> pour les terminaux manquant
+          de capacités comme le texte barré ou les demi-lignes</para>
+          <indexterm zone="ch-system-util-linux-ng colcrt">
+            <primary sortas="b-colcrt">colcrt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="colrm">
+        <term><command>colrm</command></term>
+        <listitem>
+          <para>Filtre les colonnes données</para>
+          <indexterm zone="ch-system-util-linux-ng colrm">
+            <primary sortas="b-colrm">colrm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="column">
+        <term><command>column</command></term>
+        <listitem>
+          <para>Formate un fichier donné en plusieurs colonnes</para>
+          <indexterm zone="ch-system-util-linux-ng column">
+            <primary sortas="b-column">column</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ctrlaltdel">
+        <term><command>ctrlaltdel</command></term>
+        <listitem>
+          <para>Initialise la combinaison des touches Ctrl+Alt+Del pour une
+          réinitialisation matérielle ou logicielle</para>
+          <indexterm zone="ch-system-util-linux-ng ctrlaltdel">
+            <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cytune">
+        <term><command>cytune</command></term>
+        <listitem>
+          <para>Est utilisé pour paramétrer finement les pilotes de lignes séries des
+          cartes Cyclades</para>
+          <indexterm zone="ch-system-util-linux-ng cytune">
+            <primary sortas="b-cytune">cytune</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ddate">
+        <term><command>ddate</command></term>
+        <listitem>
+          <para>Donne la date discordienne ou convertit la date grégorienne en une date
+          discordienne</para>
+          <indexterm zone="ch-system-util-linux-ng ddate">
+            <primary sortas="b-ddate">ddate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="delpart">
+        <term><command>delpart</command></term>
+        <listitem>
+          <para>Demande au noyau de supprimer une partition</para>
+          <indexterm zone="ch-system-util-linux-ng delpart">
+            <primary sortas="b-delpart">delpart</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="dmesg">
+        <term><command>dmesg</command></term>
+        <listitem>
+          <para>Affiche les messages du noyau lors du démarrage</para>
+          <indexterm zone="ch-system-util-linux-ng dmesg">
+            <primary sortas="b-dmesg">dmesg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry id="fdformat">
+        <term><command>fdformat</command></term>
+        <listitem>
+          <para>Réalise un formatage de bas niveau sur un disque amovible</para>
+          <indexterm zone="ch-system-util-linux-ng fdformat">
+            <primary sortas="b-fdformat">fdformat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fdisk">
+        <term><command>fdisk</command></term>
+        <listitem>
+          <para>Est utilisé pour manipuler la table de partitions du périphérique
+          donné</para>
+          <indexterm zone="ch-system-util-linux-ng fdisk">
+            <primary sortas="b-fdisk">fdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="findfs">
+        <term><command>findfs</command></term>
+        <listitem>
+          <para>Finds a file system by label or Universally Unique Identifier
+          (UUID)</para>
+          <indexterm zone="ch-system-util-linux-ng findfs">
+            <primary sortas="b-findfs">findfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="flock">
+        <term><command>flock</command></term>
+        <listitem>
+          <para>Acquiert le verrouillage d'un fichier puis exécute 
+          une commande en maintenant le verrouillage</para>
+          <indexterm zone="ch-system-util-linux-ng flock">
+            <primary sortas="b-flock">flock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fsck">
+        <term><command>fsck</command></term>
+        <listitem>
+          <para>Est utilisé pour vérifier, et parfois réparer, les systèmes de
+          fichiers</para>
+          <indexterm zone="ch-system-util-linux-ng fsck">
+            <primary sortas="b-fsck">fsck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fsck.cramfs">
+        <term><command>fsck.cramfs</command></term>
+        <listitem>
+          <para>Réalise un test de cohérence sur le système de fichiers Cramfs 
+          du périphérique donné</para>
+          <indexterm zone="ch-system-util-linux-ng fsck.cramfs">
+            <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fsck.minix">
+        <term><command>fsck.minix</command></term>
+        <listitem>
+          <para>Réalise un test de cohérence sur le système de fichiers Minix du
+          périphérique donné</para>
+          <indexterm zone="ch-system-util-linux-ng fsck.minix">
+            <primary sortas="b-fsck.minix">fsck.minix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getopt">
+        <term><command>getopt</command></term>
+        <listitem>
+          <para>Analyse les options sur la ligne de commande donnée</para>
+          <indexterm zone="ch-system-util-linux-ng getopt">
+            <primary sortas="b-getopt">getopt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hexdump">
+        <term><command>hexdump</command></term>
+        <listitem>
+          <para>Affiche le fichier indiqué en hexadécimal ou dans un autre format
+          donné</para>
+          <indexterm zone="ch-system-util-linux-ng hexdump">
+            <primary sortas="b-hexdump">hexdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hwclock">
+        <term><command>hwclock</command></term>
+        <listitem>
+          <para>Lit ou initialise l'horloge matériel, aussi appelée horloge RTC
+          (<foreignphrase>Real-Time Clock</foreignphrase>, horloge à temps réel) ou
+          horloge BIOS (<foreignphrase>Basic Input-Output System</foreignphrase>)</para>
+          <indexterm zone="ch-system-util-linux-ng hwclock">
+            <primary sortas="b-hwclock">hwclock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="ionice">
+        <term><command>ionice</command></term>
+        <listitem>
+          <para>Donne ou initialise la classe de planification IO (ES) et la 
+          priorité pour un programme</para>
+          <indexterm zone="ch-system-util-linux-ng ionice">
+            <primary sortas="b-ionice">ionice</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>     
+
+      <varlistentry id="ipcmk">
+        <term><command>ipcmk</command></term>
+        <listitem>
+          <para>Crée diverses ressources IPC</para>
+          <indexterm zone="ch-system-util-linux-ng ipcmk">
+            <primary sortas="b-ipcmk">ipcmk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ipcrm">
+        <term><command>ipcrm</command></term>
+        <listitem>
+          <para>Supprime la ressource IPC (inter-process communication) donnée</para>
+          <indexterm zone="ch-system-util-linux-ng ipcrm">
+            <primary sortas="b-ipcrm">ipcrm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ipcs">
+        <term><command>ipcs</command></term>
+        <listitem>
+          <para>Fournit l'information de statut IPC</para>
+          <indexterm zone="ch-system-util-linux-ng ipcs">
+            <primary sortas="b-ipcs">ipcs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="isosize">
+        <term><command>isosize</command></term>
+        <listitem>
+          <para>Affiche la taille d'un système de fichiers iso9660</para>
+          <indexterm zone="ch-system-util-linux-ng isosize">
+            <primary sortas="b-isosize">isosize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="ldattach">
+        <term><command>ldattach</command></term>
+        <listitem>
+          <para>Attache une ligne de discipline à une ligne en série.</para>
+          <indexterm zone="ch-system-util-linux-ng ldattach">
+            <primary sortas="b-ldattach">ldattach</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="line">
+        <term><command>line</command></term>
+        <listitem>
+          <para>Copie une simple ligne</para>
+          <indexterm zone="ch-system-util-linux-ng line">
+            <primary sortas="b-line">line</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="logger">
+        <term><command>logger</command></term>
+        <listitem>
+          <para>Enregistre le message donné dans les traces système</para>
+          <indexterm zone="ch-system-util-linux-ng logger">
+            <primary sortas="b-logger">logger</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="look">
+        <term><command>look</command></term>
+        <listitem>
+          <para>Affiche les lignes commençant avec la chaîne donnée</para>
+          <indexterm zone="ch-system-util-linux-ng look">
+            <primary sortas="b-look">look</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="losetup">
+        <term><command>losetup</command></term>
+        <listitem>
+          <para>Initialise et contrôle les périphériques loop</para>
+          <indexterm zone="ch-system-util-linux-ng losetup">
+            <primary sortas="b-losetup">losetup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lscpu">
+        <term><command>lscpu</command></term>
+        <listitem>
+          <para>Affiche des informations sur l'architechture du processeur</para>
+          <indexterm zone="ch-system-util-linux-ng lscpu">
+            <primary sortas="b-lscpu">lscpu</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mcookie">
+        <term><command>mcookie</command></term>
+        <listitem>
+          <para>Génère des cookies magiques, nombres hexadécimaux aléatoires sur 128
+          bits, pour <command>xauth</command></para>
+          <indexterm zone="ch-system-util-linux-ng mcookie">
+            <primary sortas="b-mcookie">mcookie</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs">
+        <term><command>mkfs</command></term>
+        <listitem>
+          <para>Construit un système de fichiers sur un périphérique (habituellement une
+          partition du disque dur)</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs">
+            <primary sortas="b-mkfs">mkfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.bfs">
+        <term><command>mkfs.bfs</command></term>
+        <listitem>
+          <para>Crée un système de fichiers bfs de SCO (Santa Cruz Operations)</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs.bfs">
+            <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.cramfs">
+        <term><command>mkfs.cramfs</command></term>
+        <listitem>
+          <para>Crée un système de fichiers cramfs</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs.cramfs">
+            <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.minix">
+        <term><command>mkfs.minix</command></term>
+        <listitem>
+          <para>Crée un système de fichiers Minix</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs.minix">
+            <primary sortas="b-mkfs.minix">mkfs.minix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkswap">
+        <term><command>mkswap</command></term>
+        <listitem>
+          <para>Initialise le périphérique ou le fichier à utiliser comme swap</para>
+          <indexterm zone="ch-system-util-linux-ng mkswap">
+            <primary sortas="b-mkswap">mkswap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="more">
+        <term><command>more</command></term>
+        <listitem>
+          <para>Est un filtre pour visualiser un texte un écran à la fois</para>
+          <indexterm zone="ch-system-util-linux-ng more">
+            <primary sortas="b-more">more</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mount">
+        <term><command>mount</command></term>
+        <listitem>
+          <para>Attache le système de fichiers du périphérique donné sur un répertoire
+          spécifié dans le système de fichiers</para>
+          <indexterm zone="ch-system-util-linux-ng mount">
+            <primary sortas="b-mount">mount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="namei">
+        <term><command>namei</command></term>
+        <listitem>
+          <para>Affiche les liens symboliques dans les chemins donnés</para>
+          <indexterm zone="ch-system-util-linux-ng namei">
+            <primary sortas="b-namei">namei</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="partx">
+        <term><command>partx</command></term>
+        <listitem>
+          <para>Signale au noyau la présence et le nombre de partitions sur un
+          disque</para>
+          <indexterm zone="ch-system-util-linux-ng partx">
+            <primary sortas="b-partx">partx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="pg">
+        <term><command>pg</command></term>
+        <listitem>
+          <para>Affiche un fichier texte un écran à la fois</para>
+          <indexterm zone="ch-system-util-linux-ng pg">
+            <primary sortas="b-pg">pg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pivot_root">
+        <term><command>pivot_root</command></term>
+        <listitem>
+          <para>Fait en sorte que le système de fichiers donné soit le nouveau système de
+          fichiers racine du processus actuel</para>
+          <indexterm zone="ch-system-util-linux-ng pivot_root">
+            <primary sortas="b-pivot_root">pivot_root</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="readprofile">
+        <term><command>readprofile</command></term>
+        <listitem>
+          <para>>Lit les informations de profilage du noyau</para>
+          <indexterm zone="ch-system-util-linux-ng readprofile">
+            <primary sortas="b-readprofile">readprofile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rename">
+        <term><command>rename</command></term>
+        <listitem>
+          <para>Renomme les fichiers donnés, remplaçant une chaîne donnée par une
+          autre</para>
+          <indexterm zone="ch-system-util-linux-ng rename">
+            <primary sortas="b-rename">rename</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="renice">
+        <term><command>renice</command></term>
+        <listitem>
+          <para>Modifie la priorité des processus exécutés</para>
+          <indexterm zone="ch-system-util-linux-ng renice">
+            <primary sortas="b-renice">renice</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rev">
+        <term><command>rev</command></term>
+        <listitem>
+          <para>Inverse les lignes d'un fichier donné</para>
+          <indexterm zone="ch-system-util-linux-ng rev">
+            <primary sortas="b-rev">rev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rtcwake">
+        <term><command>rtcwake</command></term>
+        <listitem>
+          <para>Met un système en sommeil jusqu'à un moment
+          de réveil spécifié</para>
+          <indexterm zone="ch-system-util-linux-ng rtcwake">
+            <primary sortas="b-rtcwake">rtcwake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry> 
+      <varlistentry id="script">
+        <term><command>script</command></term>
+        <listitem>
+          <para>Crée une transcription de session du terminal à partir de tout ce qui est
+          affiché sur un terminal</para>
+          <indexterm zone="ch-system-util-linux-ng script">
+            <primary sortas="b-script">script</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="scriptreplay">
+        <term><command>scriptreplay</command></term>
+        <listitem>
+          <para>Rejoue une transcription créée par <command>script</command></para>
+          <indexterm zone="ch-system-util-linux-ng scriptreplay">
+            <primary sortas="b-scriptreplay">scriptreplay</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="setarch">
+        <term><command>setarch</command></term>
+        <listitem>
+          <para>Change d'architecture signalée dans un nouvel environnement de
+          programme et initialise les commutateurs de personnalité</para>
+          <indexterm zone="ch-system-util-linux-ng setarch">
+            <primary sortas="b-setarch">setarch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="setsid">
+        <term><command>setsid</command></term>
+        <listitem>
+          <para>Lance le programme donné dans une nouvelle session</para>
+          <indexterm zone="ch-system-util-linux-ng setsid">
+            <primary sortas="b-setsid">setsid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setterm">
+        <term><command>setterm</command></term>
+        <listitem>
+          <para>Initialise les attributs du terminal</para>
+          <indexterm zone="ch-system-util-linux-ng setterm">
+            <primary sortas="b-setterm">setterm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sfdisk">
+        <term><command>sfdisk</command></term>
+        <listitem>
+          <para>Un manipulateur de table de partitions disque</para>
+          <indexterm zone="ch-system-util-linux-ng sfdisk">
+            <primary sortas="b-sfdisk">sfdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="swapoff">
+        <term><command>swapoff</command></term>
+        <listitem>
+          <para>Désactive les périphériques et fichiers de pagination et d'échange.</para>
+
+          <indexterm zone="ch-system-util-linux-ng swapoff">
+            <primary sortas="b-swapoff">swapoff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="swapon">
+        <term><command>swapon</command></term>
+        <listitem>
+          <para>Active les périphériques et fichiers de pagination et d'échange, 
+          et liste les périphériques et fichiers en cours d'utilisation.</para>
+          <indexterm zone="ch-system-util-linux-ng swapon">
+            <primary sortas="b-swapon">swapon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="switch_root">
+        <term><command>switch_root</command></term>
+        <listitem>
+          <para>Change vers un autre système de fichiers pour racine de l'arborescence montée</para>
+          <indexterm zone="ch-system-util-linux-ng switch_root">
+            <primary sortas="b-switch_root">switch_root</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tailf">
+        <term><command>tailf</command></term>
+        <listitem>
+          <para>Observe la croissance d'un fichier journal. Affiche les 10 
+          dernières lignes d'un fichier journal, puis continue à afficher toute
+          nouvelle entrée dans le fichier journal dès qu'elle est créée</para>
+          <indexterm zone="ch-system-util-linux-ng tailf">
+            <primary sortas="b-tailf">tailf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="taskset">
+        <term><command>taskset</command></term>
+        <listitem>
+          <para>Récupère ou initialise l'affinité processeur du processus</para>
+          <indexterm zone="ch-system-util-linux-ng taskset">
+            <primary sortas="b-taskset">taskset</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tunelp">
+        <term><command>tunelp</command></term>
+        <listitem>
+          <para>Est utilisé pour paramétrer finement une imprimante ligne</para>
+          <indexterm zone="ch-system-util-linux-ng tunelp">
+            <primary sortas="b-tunelp">tunelp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ul">
+        <term><command>ul</command></term>
+        <listitem>
+          <para>Un filtre pour traduire les soulignements en séquences d'échappement
+          indiquant un soulignement pour le terminal utilisé</para>
+          <indexterm zone="ch-system-util-linux-ng ul">
+            <primary sortas="b-ul">ul</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="umount">
+        <term><command>umount</command></term>
+        <listitem>
+          <para>Déconnecte un système de fichiers à partir de la hiérarchie de fichiers
+          du système</para>
+          <indexterm zone="ch-system-util-linux-ng umount">
+            <primary sortas="b-umount">umount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry id="uuidd">
+        <term><command>uuidd</command></term>
+        <listitem>
+          <para>Un démon utilisé par la bibliothèque UUID pour générer des UUIDs
+          basés sur l'heure de manière sécurisée et avec une garantie unique.</para>
+          <indexterm zone="ch-system-util-linux-ng uuidd">
+            <primary sortas="b-uuidd">uuidd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="uuidgen">
+        <term><command>uuidgen</command></term>
+        <listitem>
+          <para>Crée un nouvel UUID. Chaque nouvel UUID peut être raisonnablement
+          considéré unique parmi tous les UUID créés, sur le système local mais aussi sur
+          les autres, dans le passé et dans le futur.</para>
+          <indexterm zone="ch-system-util-linux-ng uuidgen">
+            <primary sortas="b-uuidgen">uuidgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="whereis">
+        <term><command>whereis</command></term>
+        <listitem>
+          <para>Affiche l'emplacement du binaire, les sources et la page de manuel de la
+          commande donnée</para>
+          <indexterm zone="ch-system-util-linux-ng whereis">
+            <primary sortas="b-whereis">whereis</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write">
+        <term><command>write</command></term>
+        <listitem>
+          <para>Envoie un message à l'utilisateur donné <emphasis>sauf si</emphasis>
+          l'utilisateur a désactivé de tels messages</para>
+          <indexterm zone="ch-system-util-linux-ng write">
+            <primary sortas="b-write">write</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libblkid">
+        <term><filename class="libraryfile">libblkid</filename></term>
+        <listitem>
+          <para>Contient des routines pour l'identification de processus et l'extraction
+          de jetons</para>
+          <indexterm zone="ch-system-util-linux-ng libblkid">
+            <primary sortas="c-libblkid">libblkid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libuuid">
+        <term><filename class="libraryfile">libuuid</filename></term>
+        <listitem>
+          <para>Contient des routines pour générer des identifieurs uniques pour les
+          objets qui pourraient être accessibles en dehors du système local</para>
+          <indexterm zone="ch-system-util-linux-ng libuuid">
+            <primary sortas="c-libuuid">libuuid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
+

Modified: trunk/clfs/final-system/mips-chapter.xml
===================================================================
--- trunk/clfs/final-system/mips-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/mips-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -29,7 +29,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>

Added: trunk/clfs/final-system/mips64/pkg-config.xml
===================================================================
--- trunk/clfs/final-system/mips64/pkg-config.xml	                        (rev 0)
+++ trunk/clfs/final-system/mips64/pkg-config.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-pkg-config" role="wrap">
+  <?dbhtml filename="pkg-config.html"?>
+
+  <title>Pkg-config-&pkg-config-version;</title>
+
+  <indexterm zone="ch-system-pkg-config">
+    <primary sortas="a-Autoconf">Pkg-config</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/pkg-config.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Pkg-config</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/pkg-config.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/pkg-config.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>export PKG_CONFIG_PATH32="/usr/lib/pkgconfig"
+export PKG_CONFIG_PATHN32="/usr/lib32/pkgconfig"
+export PKG_CONFIG_PATH64="/usr/lib64/pkgconfig"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/pkg-config.xml"
+    xpointer="xpointer(//*[@os='m3'])"/>
+
+<screen os="m4"><userinput>cat >> ${CLFS}/root/.bash_profile << EOF
+export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
+export PKG_CONFIG_PATHN32="${PKG_CONFIG_PATHN32}"
+export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
+EOF</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/pkg-config.xml"
+  xpointer="xpointer(id('contents-pkg-config'))"/>
+
+</sect1>

Modified: trunk/clfs/final-system/mips64-64-chapter.xml
===================================================================
--- trunk/clfs/final-system/mips64-64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/mips64-64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -29,7 +29,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>

Modified: trunk/clfs/final-system/mips64-chapter.xml
===================================================================
--- trunk/clfs/final-system/mips64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/mips64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -44,9 +44,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>

Modified: trunk/clfs/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/e2fsprogs-64bit.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/multilib/e2fsprogs-64bit.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -38,8 +38,8 @@
     href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG=true \
-    ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+  ../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>

Modified: trunk/clfs/final-system/multilib/e2fsprogs-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/e2fsprogs-n32.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/multilib/e2fsprogs-n32.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -39,8 +39,8 @@
     href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG=true \
-    ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+  ../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>

Modified: trunk/clfs/final-system/multilib/e2fsprogs.xml
===================================================================
--- trunk/clfs/final-system/multilib/e2fsprogs.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/multilib/e2fsprogs.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -34,8 +34,8 @@
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG=true \
-    ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+  ../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>

Added: trunk/clfs/final-system/multilib/pkg-config.xml
===================================================================
--- trunk/clfs/final-system/multilib/pkg-config.xml	                        (rev 0)
+++ trunk/clfs/final-system/multilib/pkg-config.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-pkg-config" role="wrap">
+  <?dbhtml filename="pkg-config.html"?>
+
+  <title>Pkg-config-&pkg-config-version;</title>
+
+  <indexterm zone="ch-system-pkg-config">
+    <primary sortas="a-Autoconf">Pkg-config</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/pkg-config.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation de Pkg-config</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+  ./configure --prefix=/usr \
+    --with-pc-path=/usr/share/pkgconfig </userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/pkg-config.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <para os="m1">Sur des constructions multilib, le répertoire de la 
+    bibliothèque a été enlevé du path de recherche par défaut de <command>pkg-config</command>. 
+    Réglez des variables d'environnement pour aider à régler correctement
+    le chemin à l'avenir :</para>
+
+<screen os="m2"><userinput>export PKG_CONFIG_PATH32="/usr/lib/pkgconfig"
+export PKG_CONFIG_PATH64="/usr/lib64/pkgconfig"</userinput></screen>
+
+    <para os="m3">Export these variables to prevent any issues in the
+    future.</para>
+
+<screen os="m4"><userinput>cat >> ${CLFS}/root/.bash_profile << EOF
+export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
+export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
+EOF</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/pkg-config.xml"
+  xpointer="xpointer(id('contents-pkg-config'))"/>
+
+</sect1>

Modified: trunk/clfs/final-system/multilib/procps-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/procps-64bit.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/multilib/procps-64bit.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -23,6 +23,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/multilib/procps-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/procps-n32.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/multilib/procps-n32.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -24,6 +24,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/clfs/final-system/multilib/procps.xml
===================================================================
--- trunk/clfs/final-system/multilib/procps.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/multilib/procps.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -24,6 +24,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Copied: trunk/clfs/final-system/multilib/util-linux-64bit.xml (from rev 1258, trunk/clfs/final-system/multilib/util-linux-ng-64bit.xml)
===================================================================
--- trunk/clfs/final-system/multilib/util-linux-64bit.xml	                        (rev 0)
+++ trunk/clfs/final-system/multilib/util-linux-64bit.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng-64bit.html"?>
+
+  <title>Util-linux-&util-linux-version; 64 bits</title>
+
+  <indexterm zone="ch-system-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/util-linux.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/util-linux.xml"
+  xpointer="xpointer(//*[@id='fhs-util-linux-ng'])"/>
+
+  <sect2 role="installation">
+    <title>Installation de Util-linux-ng</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
+    --enable-partx --disable-wall --enable-write</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/util-linux.xml"
+  xpointer="xpointer(id('contents-util-linux-ng'))"/>
+
+</sect1>

Copied: trunk/clfs/final-system/multilib/util-linux-n32.xml (from rev 1258, trunk/clfs/final-system/multilib/util-linux-ng-n32.xml)
===================================================================
--- trunk/clfs/final-system/multilib/util-linux-n32.xml	                        (rev 0)
+++ trunk/clfs/final-system/multilib/util-linux-n32.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-util-linux-ng-n32" role="wrap">
+  <?dbhtml filename="util-linux-ng-n32.html"?>
+
+  <title>Util-linux-&util-linux-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-util-linux-ng-n32">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/util-linux.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation d'Util-linux-ng</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
+    --enable-partx --disable-wall --enable-write</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Les détails sur ce paquet sont disponibles dans <xref
+    linkend="contents-util-linux-ng" role="."/></para>
+
+  </sect2>
+
+</sect1>

Deleted: trunk/clfs/final-system/multilib/util-linux-ng-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/util-linux-ng-64bit.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/multilib/util-linux-ng-64bit.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng-64bit.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version; 64 bits</title>
-
-  <indexterm zone="ch-system-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@id='fhs-util-linux-ng'])"/>
-
-  <sect2 role="installation">
-    <title>Installation de Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
-    --enable-partx --disable-wall --enable-write</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(id('contents-util-linux-ng'))"/>
-
-</sect1>

Deleted: trunk/clfs/final-system/multilib/util-linux-ng-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/util-linux-ng-n32.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/multilib/util-linux-ng-n32.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-ng-n32" role="wrap">
-  <?dbhtml filename="util-linux-ng-n32.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-util-linux-ng-n32">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation d'Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
-    --enable-partx --disable-wall --enable-write</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont disponibles dans <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>

Deleted: trunk/clfs/final-system/multilib/util-linux-ng.xml
===================================================================
--- trunk/clfs/final-system/multilib/util-linux-ng.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/multilib/util-linux-ng.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-ng-32" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Bibliothèques Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-system-util-linux-ng-32">
-    <primary sortas="a-Util-linux-ng">Bibliothèques Util-linux-ng 32 bits</primary>
-    <secondary>32 bits</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation de Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
-    --enable-partx --disable-wall --enable-write</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont disponibles dans <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>

Copied: trunk/clfs/final-system/multilib/util-linux.xml (from rev 1258, trunk/clfs/final-system/multilib/util-linux-ng.xml)
===================================================================
--- trunk/clfs/final-system/multilib/util-linux.xml	                        (rev 0)
+++ trunk/clfs/final-system/multilib/util-linux.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-util-linux-ng-32" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <title>Bibliothèques Util-linux-&util-linux-version;</title>
+
+  <indexterm zone="ch-system-util-linux-ng-32">
+    <primary sortas="a-Util-linux-ng">Bibliothèques Util-linux-ng 32 bits</primary>
+    <secondary>32 bits</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/util-linux.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation de Util-linux-ng</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
+    --enable-partx --disable-wall --enable-write</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Les détails sur ce paquet sont disponibles dans <xref
+    linkend="contents-util-linux-ng" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/clfs/final-system/ppc-chapter.xml
===================================================================
--- trunk/clfs/final-system/ppc-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/ppc-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -29,7 +29,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>

Modified: trunk/clfs/final-system/ppc64-chapter.xml
===================================================================
--- trunk/clfs/final-system/ppc64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/ppc64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -38,8 +38,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>

Modified: trunk/clfs/final-system/sparc-chapter.xml
===================================================================
--- trunk/clfs/final-system/sparc-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/sparc-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -29,7 +29,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>

Modified: trunk/clfs/final-system/sparc64-64-chapter.xml
===================================================================
--- trunk/clfs/final-system/sparc64-64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/sparc64-64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -29,7 +29,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>

Modified: trunk/clfs/final-system/sparc64-chapter.xml
===================================================================
--- trunk/clfs/final-system/sparc64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/sparc64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -38,8 +38,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>

Modified: trunk/clfs/final-system/x86-chapter.xml
===================================================================
--- trunk/clfs/final-system/x86-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/x86-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -29,7 +29,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>

Modified: trunk/clfs/final-system/x86_64-64-chapter.xml
===================================================================
--- trunk/clfs/final-system/x86_64-64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/x86_64-64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -29,7 +29,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>

Modified: trunk/clfs/final-system/x86_64-chapter.xml
===================================================================
--- trunk/clfs/final-system/x86_64-chapter.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/final-system/x86_64-chapter.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -38,8 +38,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>

Modified: trunk/clfs/general.ent
===================================================================
--- trunk/clfs/general.ent	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/general.ent	2011-01-30 23:33:14 UTC (rev 1259)
@@ -2,7 +2,7 @@
 
 <!ENTITY month "01"> <!-- Use two digits -->
 <!ENTITY month_name "janvier">
-<!ENTITY day "23"> <!-- Use two digits -->
+<!ENTITY day "30"> <!-- Use two digits -->
 <!ENTITY year "2011"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">

Modified: trunk/clfs/introduction/common/changelog.xml
===================================================================
--- trunk/clfs/introduction/common/changelog.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/introduction/common/changelog.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -37,6 +37,27 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>30 janvier 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Ajout de Pkg-config 0.25.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Correction de procps pour que ps supporte les
+          groupes de contrôle de processus.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>29 janvier 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Mise à jour d'Util-Linux vers 2.19-rc3.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
      <listitem>
       <para>10 janvier 2011</para>
       <itemizedlist>

Modified: trunk/clfs/materials/common/packages.xml
===================================================================
--- trunk/clfs/materials/common/packages.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/materials/common/packages.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -78,6 +78,15 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Pkg-config (&pkg-config-version;) - <token>&pkg-config-size;</token> :</term>
+      <listitem>
+        <para>Page d'accueil : <ulink url="&pkg-config-home;"/></para>
+        <para>Téléchargement : <ulink url="&pkg-config-url;"/></para>
+        <para>Somme de contrôle MD5 : <literal>&pkg-config-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>ClooG-PPL (&cloog-ppl-version;) - <token>&cloog-ppl-size;</token> :</term>
       <listitem>
         <para>Page d'accueil : <ulink url="&cloog-ppl-home;"/></para>
@@ -509,11 +518,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Util-linux-ng (&util-linux-ng-version;) - <token>&util-linux-ng-size;</token> :</term>
+      <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token> :</term>
       <listitem>
-        <para>Page d'accueil : <ulink url="&util-linux-ng-home;"/></para>
-        <para>Téléchargement : <ulink url="&util-linux-ng-url;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&util-linux-ng-md5;</literal></para>
+        <para>Page d'accueil : <ulink url="&util-linux-home;"/></para>
+        <para>Téléchargement : <ulink url="&util-linux-url;"/></para>
+        <para>Somme de contrôle MD5 : <literal>&util-linux-md5;</literal></para>
       </listitem>
     </varlistentry>
 

Modified: trunk/clfs/materials/common/patches.xml
===================================================================
--- trunk/clfs/materials/common/patches.xml	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/materials/common/patches.xml	2011-01-30 23:33:14 UTC (rev 1259)
@@ -120,6 +120,15 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Procps correctif ps cgroup - <token>&procps-ps_cgroup-patch-size;</token> :</term>
+      <listitem>
+        <para>Téléchargement : <ulink
+        url="&patches-root;&procps-ps_cgroup-patch;"/></para>
+        <para>Somme de contrôle MD5 : <literal>&procps-ps_cgroup-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Readline Correctif Branche Mise à jour - <token>&readline-branch_update-patch-size;</token> :</term>
       <listitem>
         <para>Téléchargement : <ulink

Modified: trunk/clfs/packages.ent
===================================================================
--- trunk/clfs/packages.ent	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/packages.ent	2011-01-30 23:33:14 UTC (rev 1259)
@@ -321,6 +321,12 @@
 <!ENTITY perl-md5 "7b018fe9c2f434eff0c629b4c515a8fc">
 <!ENTITY perl-home "http://www.perl.org">
 
+<!ENTITY pkg-config-version "0.25">
+<!ENTITY pkg-config-size "968 Kio">
+<!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
+<!ENTITY pkg-config-md5 "a3270bab3f4b69b7dc6dbdacbcae9745">
+<!ENTITY pkg-config-home "http://pkgconfig.freedesktop.org/wiki/">
+
 <!ENTITY powerpcutils-version "1.1.3">
 <!ENTITY powerpcutils-size "24 Kio">
 <!ENTITY powerpcutils-url "http://ftp.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_&powerpcutils-version;.orig.tar.gz">
@@ -413,17 +419,16 @@
 <!ENTITY uname_hack-md5 "dd7694f28ccc6e6bfb326b1790adb5e9">
 <!ENTITY uname_hack-home " ">
 
-<!ENTITY util-linux-ng-dl-version "2.16">
+<!ENTITY util-linux-dl-version "2.16">
+<!ENTITY util-linux-major-version "2.18">
+<!ENTITY util-linux-version "&util-linux-major-version;">
+<!ENTITY util-linux-size "7,492 Kio">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.bz2">
+<!ENTITY util-linux-md5 "2f5f71e6af969d041d73ab778c141a77">
+<!ENTITY util-linux-blkid-id "1.1.0">
+<!ENTITY util-linux-uuid-id "1.3.0">
+<!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
 
-<!ENTITY util-linux-ng-major-version "2.18">
-<!ENTITY util-linux-ng-version "&util-linux-ng-major-version;">
-<!ENTITY util-linux-ng-size "7,492 Kio">
-<!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v&util-linux-ng-major-version;/util-linux-ng-&util-linux-ng-version;.tar.bz2">
-<!ENTITY util-linux-ng-md5 "2f5f71e6af969d041d73ab778c141a77">
-<!ENTITY util-linux-ng-blkid-id "1.1.0">
-<!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.3">
 <!ENTITY vim-version2 "73">
 <!ENTITY vim-size "8,868 Kio">

Modified: trunk/clfs/patches.ent
===================================================================
--- trunk/clfs/patches.ent	2011-01-28 15:03:25 UTC (rev 1258)
+++ trunk/clfs/patches.ent	2011-01-30 23:33:14 UTC (rev 1259)
@@ -52,6 +52,10 @@
 <!ENTITY perl-libc-patch-md5 "d572b0cc87b35f1806fd84f88803fb66">
 <!ENTITY perl-libc-patch-size "4 Kio">
 
+<!ENTITY procps-ps_cgroup-patch "procps-&procps-version;-ps_cgroup-1.patch">
+<!ENTITY procps-ps_cgroup-patch-md5 "3c478ef88fad23353e332b1b850ec630">
+<!ENTITY procps-ps_cgroup-patch-size "4 Kio">
+
 <!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
 <!ENTITY readline-branch_update-patch-md5 "91bb18428fcacb91b3f4c09d219e1258">
 <!ENTITY readline-branch_update-patch-size "4 Kio">




More information about the lfs-traducfr mailing list