[lfs-fr] r1415 - in trunk/lfs: . chapter01 chapter06

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Dim 4 Sep 17:28:53 PDT 2011


Author: jmengual
Date: 2011-09-05 02:28:53 +0200 (Mon, 05 Sep 2011)
New Revision: 1415

Modified:
   trunk/lfs/chapter01/changelog.xml
   trunk/lfs/chapter06/pkg-config.xml
   trunk/lfs/chapter06/sysvinit.xml
   trunk/lfs/chapter06/util-linux.xml
   trunk/lfs/general.ent
Log:
Correction dans pkg-config


Modified: trunk/lfs/chapter01/changelog.xml
===================================================================
--- trunk/lfs/chapter01/changelog.xml	2011-09-04 16:27:35 UTC (rev 1414)
+++ trunk/lfs/chapter01/changelog.xml	2011-09-05 00:28:53 UTC (rev 1415)
@@ -38,6 +38,21 @@
 
 -->
     <listitem>
+      <para>04-09-2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Correction d'une fonction popt cassée dans
+          pkg-config.</para>
+        </listitem>
+
+        <listitem>
+          <para>[bdubbs] - Suppression de la substitution de mountpoint de
+          sysvinit à celui d'util-linux.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>03-09-2011</para>
       <itemizedlist>
         <listitem>

Modified: trunk/lfs/chapter06/pkg-config.xml
===================================================================
--- trunk/lfs/chapter06/pkg-config.xml	2011-09-04 16:27:35 UTC (rev 1414)
+++ trunk/lfs/chapter06/pkg-config.xml	2011-09-05 00:28:53 UTC (rev 1415)
@@ -50,7 +50,7 @@
 
     <para>Corrigez un problème avec un des tests de Pkg-config :</para>
 
-<screen><userinput remap="pre">sed -i -e '21s/EXPECT_RETURN=1/EXPECT_RETURN=0/' check/check-cmd-options</userinput></screen>
+<screen><userinput remap="pre">sed -i -e '/!done/i/   longArg = NULL;' popt/popt.c</userinput></screen>
 
     <para>Préparez la compilation de Pkg-config :</para>
 

Modified: trunk/lfs/chapter06/sysvinit.xml
===================================================================
--- trunk/lfs/chapter06/sysvinit.xml	2011-09-04 16:27:35 UTC (rev 1414)
+++ trunk/lfs/chapter06/sysvinit.xml	2011-09-05 00:28:53 UTC (rev 1415)
@@ -57,12 +57,16 @@
 <screen><userinput remap="pre">sed -i 's at Sending processes@& configured via /etc/inittab at g' \
     src/init.c</userinput></screen>
 
-    <para>Une version maintenue du programme <command>wall</command> a été
-    installée plus haut par Util-linux. Supprimez
-    l'installation de la version de Sysvinit de ce programme et de sa page de man :</para>
+    <para>Les versions maintenues des programmes <command>wall</command> et
+    <command>mountpoint</command> ont été
+    installées plus haut par Util-linux. Supprimez
+    l'installation de la version de Sysvinit de ces programmes et de leur page 
+    de man :</para>
     
 <screen><userinput remap="make">sed -i -e 's/utmpdump wall/utmpdump/' \
-       -e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile</userinput></screen>
+       -e '/= mountpoint/d' \
+       -e 's/mountpoint.1 wall.1//' src/Makefile</userinput></screen>
+
     <para>Compilez le paquet :</para>
 
 <screen><userinput remap="make">make -C src</userinput></screen>
@@ -187,16 +191,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="mountpoint">
-        <term><command>mountpoint</command></term>
-        <listitem>
-          <para>Vérifie si le répertoire est un point de montage</para>
-          <indexterm zone="ch-system-sysvinit mountpoint">
-            <primary sortas="b-mountpoint">mountpoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="pidof">
         <term><command>pidof</command></term>
         <listitem>

Modified: trunk/lfs/chapter06/util-linux.xml
===================================================================
--- trunk/lfs/chapter06/util-linux.xml	2011-09-04 16:27:35 UTC (rev 1414)
+++ trunk/lfs/chapter06/util-linux.xml	2011-09-05 00:28:53 UTC (rev 1415)
@@ -114,7 +114,7 @@
         fsck.cramfs, fsck.minix, fsfreeze, getopt, hexdump, hwclock, i386,
         ionice, ipcmk, ipcrm, ipcs, isosize, ldattach, line, linux32, linux64,
         logger, look, losetup, lscpu, mcookie, mkfs, mkfs.bfs, mkfs.cramfs,
-        mkfs.minix, mkswap, more, mount, namei, partx, pg, pivot_root,
+        mkfs.minix, mkswap, more, mount, mountpoint, namei, partx, pg, pivot_root,
         readprofile, rename, renice, rev, rtcwake, script, scriptreplay,
         setarch, setsid, setterm, sfdisk, swaplabel, swapoff (link to swapon),
         swapon, switch_root, tailf, taskset, tunelp, ul, umount, unshare,
@@ -678,6 +678,17 @@
         </listitem>
       </varlistentry>
 
+ 
+      <varlistentry id="mountpoint">
+        <term><command>mountpoint</command></term>
+        <listitem>
+          <para>Vérifie si le répertoire est un point de montage</para>
+          <indexterm zone="ch-system-util-linux mountpoint">
+            <primary sortas="b-mountpoint">mountpoint</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="namei">
         <term><command>namei</command></term>
         <listitem>

Modified: trunk/lfs/general.ent
===================================================================
--- trunk/lfs/general.ent	2011-09-04 16:27:35 UTC (rev 1414)
+++ trunk/lfs/general.ent	2011-09-05 00:28:53 UTC (rev 1415)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20110903">
-<!ENTITY releasedate "3 septembre 2011">
+<!ENTITY version "SVN-20110904">
+<!ENTITY releasedate "4 septembre 2011">
 <!ENTITY copyrightdate "1999–2011">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->




More information about the lfs-traducfr mailing list