[lfs-fr] r1165 - in trunk/lfs: . bootscripts bootscripts/contrib/lsb-v3 bootscripts/contrib/lsb-v3/init.d bootscripts/lfs/init.d chapter01 chapter03 chapter06

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Sam 29 Mai 10:00:41 PDT 2010


Author: jmengual
Date: 2010-05-29 19:00:40 +0200 (Sat, 29 May 2010)
New Revision: 1165

Modified:
   trunk/lfs/bootscripts/ChangeLog
   trunk/lfs/bootscripts/contrib/lsb-v3/ChangeLog
   trunk/lfs/bootscripts/contrib/lsb-v3/init.d/udev
   trunk/lfs/bootscripts/contrib/lsb-v3/init.d/udev_retry
   trunk/lfs/bootscripts/lfs/init.d/udev
   trunk/lfs/chapter01/changelog.xml
   trunk/lfs/chapter01/whatsnew.xml
   trunk/lfs/chapter03/patches.xml
   trunk/lfs/chapter06/gettext.xml
   trunk/lfs/chapter06/gmp.xml
   trunk/lfs/chapter06/make.xml
   trunk/lfs/chapter06/udev.xml
   trunk/lfs/general.ent
   trunk/lfs/packages.ent
   trunk/lfs/patches.ent
Log:
Mises a jour par lfs


Modified: trunk/lfs/bootscripts/ChangeLog
===================================================================
--- trunk/lfs/bootscripts/ChangeLog	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/bootscripts/ChangeLog	2010-05-29 17:00:40 UTC (rev 1165)
@@ -1,3 +1,8 @@
+2010-05-29	Matt Burgess <matthew at linuxfromscratch.org>
+   * lfs/init.d/udev: Only copy /lib/udev/devices/null, as Udev >= 155 copies
+     devices from /lib/udev/devices to /dev itself.  Udevd still needs /dev/null
+     present before starting up though.
+
 2010-04-20	Bryan Kadzban <bryan at linuxfromscratch.org>
    * lfs/init.d/udev, lfs/init.d/udev_retry: Add --action=add, to handle udev
    version 152 and newer, which send "change" events by default in udevtrigger

Modified: trunk/lfs/bootscripts/contrib/lsb-v3/ChangeLog
===================================================================
--- trunk/lfs/bootscripts/contrib/lsb-v3/ChangeLog	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/bootscripts/contrib/lsb-v3/ChangeLog	2010-05-29 17:00:40 UTC (rev 1165)
@@ -1,4 +1,14 @@
 ChangeLog
+
+20100529 - [matthew]
+                * Only copy /lib/udev/devices/null, as Udev >= 155 copies
+                  devices from /lib/udev/devices to /dev itself.
+                  Udevd still needs /dev/null present before starting up though.
+
+20100529 - [dj] * Sync to LFS-Bootscirpts-20100529
+                * Add test if /dev is already mounted in udev script.
+                * Added --action=add to udevadmin trigger lines of udev script.
+
 20100427 - [dj] * Removed unneeded X-LFS-Default* lines.
                 * Corrected udev_retry script for new udev.
                 * Corrected path of syslogd and klogd in sysklogd script.

Modified: trunk/lfs/bootscripts/contrib/lsb-v3/init.d/udev
===================================================================
--- trunk/lfs/bootscripts/contrib/lsb-v3/init.d/udev	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/bootscripts/contrib/lsb-v3/init.d/udev	2010-05-29 17:00:40 UTC (rev 1165)
@@ -37,7 +37,9 @@
 		# made or removed during this boot don't affect the next one.
 		# The reason we don't write to mtab is because we don't ever
 		# want /dev to be unavailable (such as by `umount -a').
-		mount -n -t tmpfs tmpfs /dev -o mode=755
+		if ! mountpoint /dev > /dev/null; then
+			mount -n -t tmpfs tmpfs /dev -o mode=755
+		fi
 		if [ ${?} != 0 ]; then
 			echo_failure
 			boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE}
@@ -54,8 +56,9 @@
 		# the kernel call out to any binary in response to them
 		echo > /proc/sys/kernel/hotplug
 
-		# Copy static device nodes to /dev
-		cp -a /lib/udev/devices/* /dev
+		# Copy the only static device node that Udev >= 155 doesn't
+		# handle to /dev
+		cp -a /lib/udev/devices/null /dev
 
 		# Start the udev daemon to continually watch for, and act on,
 		# uevents
@@ -63,7 +66,7 @@
 
 		# Now traverse /sys in order to "coldplug" devices that have
 		# already been discovered
-		/sbin/udevadm trigger
+		/sbin/udevadm trigger --action=add
 
 		# Now wait for udevd to process the uevents we triggered
 		/sbin/udevadm settle

Modified: trunk/lfs/bootscripts/contrib/lsb-v3/init.d/udev_retry
===================================================================
--- trunk/lfs/bootscripts/contrib/lsb-v3/init.d/udev_retry	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/bootscripts/contrib/lsb-v3/init.d/udev_retry	2010-05-29 17:00:40 UTC (rev 1165)
@@ -33,7 +33,7 @@
                 done
 
                 # Re-trigger the failed uevents in hope they will succeed now
-                /sbin/udevadm trigger --type=failed
+                /sbin/udevadm trigger --type=failed --action=add
 
 		# Now wait for udevd to process the uevents we triggered
 		/sbin/udevadm settle

Modified: trunk/lfs/bootscripts/lfs/init.d/udev
===================================================================
--- trunk/lfs/bootscripts/lfs/init.d/udev	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/bootscripts/lfs/init.d/udev	2010-05-29 17:00:40 UTC (rev 1165)
@@ -53,8 +53,9 @@
 		# the kernel call out to any binary in response to them
 		echo > /proc/sys/kernel/hotplug
 
-		# Copy static device nodes to /dev
-		cp -a /lib/udev/devices/* /dev
+		# Copy the only static device node that Udev >= 155 doesn't
+		# handle to /dev
+		cp -a /lib/udev/devices/null /dev
 
 		# Start the udev daemon to continually watch for, and act on,
 		# uevents

Modified: trunk/lfs/chapter01/changelog.xml
===================================================================
--- trunk/lfs/chapter01/changelog.xml	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/chapter01/changelog.xml	2010-05-29 17:00:40 UTC (rev 1165)
@@ -37,6 +37,28 @@
     </listitem>
 -->
     <listitem>
+      <para>29-05-2010</para>
+      <itemizedlist>
+         <listitem>
+           <para>[matthew] - Passage à Udev-156.  Corrige
+           <ulink url="&lfs-ticket-root;2671">#2671</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[matthew] - Passage à Pkg-config-0.25.  Corrige
+           <ulink url="&lfs-ticket-root;2670">#2670</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[matthew] - Passage à Glibc-2.11.2.  Corrige
+           <ulink url="&lfs-ticket-root;2669">#2669</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Passage à Gettext-0.18. Corrige
+          <ulink url="&lfs-ticket-root;2660">#2660</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>26-05-2010</para>
       <itemizedlist>
         <listitem>

Modified: trunk/lfs/chapter01/whatsnew.xml
===================================================================
--- trunk/lfs/chapter01/whatsnew.xml	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/chapter01/whatsnew.xml	2010-05-29 17:00:40 UTC (rev 1165)
@@ -76,9 +76,9 @@
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>-->
@@ -158,6 +158,9 @@
       <para>Procps &procps-version;</para>
     </listitem>-->
     <listitem>
+      <para>Pkg-config &pkg-config-version;</para>
+    </listitem>
+    <listitem>
       <para>Psmisc &psmisc-version;</para>
     </listitem>
     <!--<listitem>
@@ -220,6 +223,9 @@
       <para>bzip2-1.0.5-version_fixes-1.patch</para>
     </listitem>
     <listitem>
+      <para>gettext-0.18-skip_test-1.patch</para>
+    </listitem>
+    <listitem>
       <para>MPC-&mpc-version;</para>
     </listitem>
 
@@ -229,6 +235,9 @@
     <title>Supprimés :</title>
 
     <listitem>
+      <para>gettext-0.17-upstream_fixes-2.patch</para>
+    </listitem>
+    <listitem>
       <para>grep-2.5.4-debian_fixes-1.patch</para>
     </listitem>
     <listitem>

Modified: trunk/lfs/chapter03/patches.xml
===================================================================
--- trunk/lfs/chapter03/patches.xml	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/chapter03/patches.xml	2010-05-29 17:00:40 UTC (rev 1165)
@@ -98,10 +98,10 @@
     </varlistentry>
  
     <varlistentry>
-      <term>Gettext correctif en amont - <token>&gettext-upstream_fixes-patch-size;</token> :</term>
+      <term>Gettext correctif saut d'un test - <token>&gettext-skip_test-patch-size;</token> :</term>
       <listitem>
-        <para>Téléchargement : <ulink url="&patches-root;&gettext-upstream_fixes-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&gettext-upstream_fixes-patch-md5;</literal></para>
+        <para>Téléchargement : <ulink url="&patches-root;&gettext-skip_test-patch;"/></para>
+        <para>Somme de contrôle MD5 : <literal>&gettext-skip_test-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 

Modified: trunk/lfs/chapter06/gettext.xml
===================================================================
--- trunk/lfs/chapter06/gettext.xml	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/chapter06/gettext.xml	2010-05-29 17:00:40 UTC (rev 1165)
@@ -45,9 +45,10 @@
   <sect2 role="installation">
     <title>Installation de Gettext</title>
 
-    <para>Appliquez un correctif qui corrige des droits sur les fichiers ainsi que leur propriétaire et un bogue interne :</para>
+    <para>Appliquez un correctif qui saute un test qui, sinon, échoue du fait de
+    l'absence d'une bibliothèque de parsing XML :</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&gettext-upstream_fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&gettext-skip_test-patch;</userinput></screen>
 
     <para>Préparez la compilation de Gettext :</para>
 

Modified: trunk/lfs/chapter06/gmp.xml
===================================================================
--- trunk/lfs/chapter06/gmp.xml	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/chapter06/gmp.xml	2010-05-29 17:00:40 UTC (rev 1165)
@@ -47,9 +47,9 @@
       si vous avez spécifié <envar>CFLAGS</envar> dans l'environnement,
       le script configure va essayer de configurer pour du 64 bits et va
       échouer. Évitez cela en invoquant la commande configure ci-dessous avec
-      <screen><userinput><parameter>ABI=32</parameter>  ./configure ...</userinput></screen></para>
+<screen role="nodump"><userinput><parameter>ABI=32</parameter> ./configure ...</userinput></screen></para>
     </note>
-    
+
     <para>Préparez la compilation de GMP :</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --enable-cxx --enable-mpbsd</userinput></screen>

Modified: trunk/lfs/chapter06/make.xml
===================================================================
--- trunk/lfs/chapter06/make.xml	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/chapter06/make.xml	2010-05-29 17:00:40 UTC (rev 1165)
@@ -41,12 +41,16 @@
   <sect2 role="installation">
     <title>Installation de Make</title>
 
- 
     <para>Tout d'abord, corrigez des problèmes qui ont été identifiés
     depuis la dernière version du paques :</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&make-upstream_fixes-patch;</userinput></screen>
 
+    <para>Maintenant, corrigez un problème connu avec la suite de tests d'où
+    il résulte qu'un des tests échoue :</para>
+
+<screen><userinput remap="pre">sed -i -e 's/-j/ -j/' tests/scripts/features/recursion</userinput></screen>
+
     <para>Préparez la compilation de Make :</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>

Modified: trunk/lfs/chapter06/udev.xml
===================================================================
--- trunk/lfs/chapter06/udev.xml	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/chapter06/udev.xml	2010-05-29 17:00:40 UTC (rev 1165)
@@ -52,12 +52,7 @@
     démarrage, ou Udev lui-même en a besoin :</para>
 
 <screen><userinput remap="install">install -dv /lib/{firmware,udev/devices/{pts,shm}}
-mknod -m0666 /lib/udev/devices/null c 1 3
-ln -sv /proc/self/fd /lib/udev/devices/fd
-ln -sv /proc/self/fd/0 /lib/udev/devices/stdin
-ln -sv /proc/self/fd/1 /lib/udev/devices/stdout
-ln -sv /proc/self/fd/2 /lib/udev/devices/stderr
-ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
+mknod -m0666 /lib/udev/devices/null c 1 3</userinput></screen>
 
     <para>Préparez la construction du paquet :</para>
     

Modified: trunk/lfs/general.ent
===================================================================
--- trunk/lfs/general.ent	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/general.ent	2010-05-29 17:00:40 UTC (rev 1165)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20100526">
-<!ENTITY releasedate "26 mai 2010">
+<!ENTITY version "SVN-20100529">
+<!ENTITY releasedate "29 mai 2010">
 <!ENTITY copyrightdate "1999–2010">
 <!ENTITY milestone "6.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

Modified: trunk/lfs/packages.ent
===================================================================
--- trunk/lfs/packages.ent	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/packages.ent	2010-05-29 17:00:40 UTC (rev 1165)
@@ -182,20 +182,20 @@
 <!ENTITY gdbm-ch6-du "2.7 Mio">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.17">
-<!ENTITY gettext-size "11,368 Kio">
+<!ENTITY gettext-version "0.18">
+<!ENTITY gettext-size "11,730 Kio">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
-<!ENTITY gettext-md5 "58a2bc6d39c0ba57823034d55d65d606">
+<!ENTITY gettext-md5 "d52a3e061032a1ed13856d42fc86f0fd">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "82 Mio">
 <!ENTITY gettext-ch5-sbu "0.8 SBU">
 <!ENTITY gettext-ch6-du "125 Mio">
 <!ENTITY gettext-ch6-sbu "5.8 SBU">
 
-<!ENTITY glibc-version "2.11.1">
-<!ENTITY glibc-size "15,302 Kio">
+<!ENTITY glibc-version "2.11.2">
+<!ENTITY glibc-size "15,308 Kio">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "6856d5d8b1239556687f0d1217f3f266">
+<!ENTITY glibc-md5 "414fc1bad64c0e34ead0bb3d0f191456">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "371 Mio">
 <!ENTITY glibc-ch5-sbu "6.9 SBU">
@@ -288,7 +288,7 @@
 <!ENTITY less-ch6-du "2.9 Mio">
 <!ENTITY less-ch6-sbu "moins de 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20100124">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20100529">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE Kio">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -417,10 +417,10 @@
 <!ENTITY perl-ch6-du "171 Mio suite de tests incluse">
 <!ENTITY perl-ch6-sbu "5.5 SBU">
 
-<!ENTITY pkg-config-version "0.23">
-<!ENTITY pkg-config-size "1,009 Kio">
+<!ENTITY pkg-config-version "0.25">
+<!ENTITY pkg-config-size "966 Kio">
 <!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
-<!ENTITY pkg-config-md5 "d922a88782b64441d06547632fd85744">
+<!ENTITY pkg-config-md5 "a3270bab3f4b69b7dc6dbdacbcae9745">
 <!ENTITY pkg-config-home "http://pkg-config.freedesktop.org/">
 <!ENTITY pkg-config-ch5-du " Mio">
 <!ENTITY pkg-config-ch5-sbu " SBU">
@@ -514,10 +514,10 @@
 <!ENTITY texinfo-ch6-du "21 Mio">
 <!ENTITY texinfo-ch6-sbu "0.3 SBU">
 
-<!ENTITY udev-version "154">
-<!ENTITY udev-size "520 Kio">
+<!ENTITY udev-version "156">
+<!ENTITY udev-size "521 Kio">
 <!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "28064e0325050a1eedec4c142da65ea7">
+<!ENTITY udev-md5 "5efef35990dd20d8bb459eaff36d1f88">
 <!ENTITY udev-home "&kernel;linux/utils/kernel/hotplug/udev.html">
 <!ENTITY udev-ch6-du "11.6 Mio">
 <!ENTITY udev-ch6-sbu "0.2 SBU">

Modified: trunk/lfs/patches.ent
===================================================================
--- trunk/lfs/patches.ent	2010-05-26 21:16:20 UTC (rev 1164)
+++ trunk/lfs/patches.ent	2010-05-29 17:00:40 UTC (rev 1165)
@@ -42,9 +42,9 @@
 <!ENTITY flex-gcc-patch-md5 "ad9109820534278c6dd0898178c0788f">
 <!ENTITY flex-gcc-patch-size "1 Kio">
 
-<!ENTITY gettext-upstream_fixes-patch "gettext-&gettext-version;-upstream_fixes-2.patch">
-<!ENTITY gettext-upstream_fixes-patch-md5 "ae64b6399ed6536e148e8386bcb91689">
-<!ENTITY gettext-upstream_fixes-patch-size "2.9 Kio">
+<!ENTITY gettext-skip_test-patch "gettext-&gettext-version;-skip_test-1.patch">
+<!ENTITY gettext-skip_test-patch-md5 "9cec8b957ff96a3028897b2910a0d3e8">
+<!ENTITY gettext-skip_test-patch-size "1.2 Kio">
 
 <!ENTITY gcc-startfiles-patch "gcc-&gcc-version;-startfiles_fix-1.patch">
 <!ENTITY gcc-startfiles-patch-md5 "799ef1971350d2e3c794f2123f247cc6">




More information about the lfs-traducfr mailing list