[lfs-fr] r5250 - branches/CLFS_2.1

myou72 at orange.fr myou72 at orange.fr
Mer 11 Déc 13:58:21 PST 2013


Author: myou72
Date: 2013-12-11 22:58:21 +0100 (Wed, 11 Dec 2013)
New Revision: 5250

Added:
   branches/CLFS_2.1/DIFF
Log:
ajout fichier DIFF ; ce qu'il faut traduire pour avoir la version CLFS 21

Added: branches/CLFS_2.1/DIFF
===================================================================
--- branches/CLFS_2.1/DIFF	                        (rev 0)
+++ branches/CLFS_2.1/DIFF	2013-12-11 21:58:21 UTC (rev 5250)
@@ -0,0 +1,475 @@
+diff --git a/BOOK/boot/ppc/yaboot-build.xml b/BOOK/boot/ppc/yaboot-build.xml
+index 41e201b..aee34b3 100644
+--- a/BOOK/boot/ppc/yaboot-build.xml
++++ b/BOOK/boot/ppc/yaboot-build.xml
+@@ -30,6 +30,14 @@
+     href="../../final-system/ppc/yaboot.xml"
+     xpointer="xpointer(//*[@os='p4'])"/>
+ 
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../final-system/ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p5'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../final-system/ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p6'])"/>
++
+     <para os="p1">The following patch allows <command>ofpath</command> to use
+     <literal>PATH_PREFIX</literal> like the other
+     <filename class="directory">ybin</filename> scripts:</para>
+diff --git a/BOOK/boot/ppc64-64/yaboot-build.xml b/BOOK/boot/ppc64-64/yaboot-build.xml
+index 3be0ed2..5292077 100644
+--- a/BOOK/boot/ppc64-64/yaboot-build.xml
++++ b/BOOK/boot/ppc64-64/yaboot-build.xml
+@@ -31,6 +31,14 @@
+     xpointer="xpointer(//*[@os='p4'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../final-system/ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p5'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../final-system/ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p6'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../ppc/yaboot-build.xml"
+     xpointer="xpointer(//*[@os='p1'])"/>
+ 
+diff --git a/BOOK/boot/ppc64/yaboot-build.xml b/BOOK/boot/ppc64/yaboot-build.xml
+index 4f5d939..9cbc0dc 100644
+--- a/BOOK/boot/ppc64/yaboot-build.xml
++++ b/BOOK/boot/ppc64/yaboot-build.xml
+@@ -31,6 +31,14 @@
+     xpointer="xpointer(//*[@os='p4'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../final-system/ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p5'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../../final-system/ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p6'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../ppc/yaboot-build.xml"
+     xpointer="xpointer(//*[@os='p1'])"/>
+ 
+diff --git a/BOOK/cross-tools/common/gmp.xml b/BOOK/cross-tools/common/gmp.xml
+index 213de8b..c64937f 100644
+--- a/BOOK/cross-tools/common/gmp.xml
++++ b/BOOK/cross-tools/common/gmp.xml
+@@ -32,6 +32,13 @@
+     xpointer="xpointer(//*[@os='p2'])"/>
+ -->
+ 
++    <note os="n1">
++      <para>If you are building with a host which has 32-bit user-space with a
++      64-bit capable CPU, cross-tools GMP will attempt to link with 64-bit
++      libraries. Add the following variable during <command>configure</command>
++      to force GMP's ABI: <command>./configure ABI=32</command></para>
++    </note>
++
+     <para os="a">Prepare GMP for compilation:</para>
+ 
+ <screen os="b"><userinput>./configure --prefix=/cross-tools --enable-cxx \
+diff --git a/BOOK/final-system/common/bison.xml b/BOOK/final-system/common/bison.xml
+index 5b69a81..cfc918b 100644
+--- a/BOOK/final-system/common/bison.xml
++++ b/BOOK/final-system/common/bison.xml
+@@ -29,6 +29,10 @@
+ 
+ <screen os="t4"><userinput>echo "ac_cv_prog_lex_is_flex=yes" > config.cache</userinput></screen>
+ 
++    <para os="p1">The test suite may fail during the check phase. Apply an upstream fix with the following patch:</para>
++
++<screen os="p2"><userinput>patch -Np1 -i ../&bison-eof-patch;</userinput></screen>
++
+     <para os="a">Prepare Bison for compilation:</para>
+ 
+ <screen os="b"><userinput>./configure --prefix=/usr --cache-file=config.cache</userinput></screen>
+diff --git a/BOOK/final-system/common/gmp.xml b/BOOK/final-system/common/gmp.xml
+index e9480f9..cd575da 100644
+--- a/BOOK/final-system/common/gmp.xml
++++ b/BOOK/final-system/common/gmp.xml
+@@ -40,8 +40,8 @@
+       wrappers with the originals. This will prevent GMP from optimizing for
+       the wrong CPU. You can make this change with the following command:</para>
+ 
+-<screen><userinput>mv -v config{fsf,}.guess
+-mv -v config{fsf,}.sub</userinput></screen>
++<screen>mv -v config{fsf,}.guess
++mv -v config{fsf,}.sub</screen>
+ 
+     </note>
+ 
+diff --git a/BOOK/final-system/multilib/bison-64bit.xml b/BOOK/final-system/multilib/bison-64bit.xml
+index 8b6a497..b5a53dd 100644
+--- a/BOOK/final-system/multilib/bison-64bit.xml
++++ b/BOOK/final-system/multilib/bison-64bit.xml
+@@ -31,6 +31,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bison.xml"
++    xpointer="xpointer(//*[@os='p1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bison.xml"
++    xpointer="xpointer(//*[@os='p2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bison.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64  --cache-file=config.cache</userinput></screen>
+diff --git a/BOOK/final-system/multilib/bison-n32.xml b/BOOK/final-system/multilib/bison-n32.xml
+index d48d82c..c5ba899 100644
+--- a/BOOK/final-system/multilib/bison-n32.xml
++++ b/BOOK/final-system/multilib/bison-n32.xml
+@@ -32,6 +32,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bison.xml"
++    xpointer="xpointer(//*[@os='p1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bison.xml"
++    xpointer="xpointer(//*[@os='p2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bison.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32  --cache-file=config.cache</userinput></screen>
+diff --git a/BOOK/final-system/multilib/bison.xml b/BOOK/final-system/multilib/bison.xml
+index 793a477..1046b0a 100644
+--- a/BOOK/final-system/multilib/bison.xml
++++ b/BOOK/final-system/multilib/bison.xml
+@@ -32,6 +32,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../common/bison.xml"
++    xpointer="xpointer(//*[@os='p1'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bison.xml"
++    xpointer="xpointer(//*[@os='p2'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../common/bison.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+ <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr  --cache-file=config.cache</userinput></screen>
+diff --git a/BOOK/final-system/ppc/yaboot.xml b/BOOK/final-system/ppc/yaboot.xml
+index 826e135..9b92fbb 100644
+--- a/BOOK/final-system/ppc/yaboot.xml
++++ b/BOOK/final-system/ppc/yaboot.xml
+@@ -25,10 +25,14 @@
+   <sect2 role="installation">
+     <title>Installation of Yaboot</title>
+ 
+-    <para os="p3">The following patch adds stub functions for newer e2fsprogs releases.</para>
++    <para os="p3">The following patch adds stub functions for newer e2fsprogs releases:</para>
+ 
+ <screen os="p4"><userinput>patch -Np1 -i ../&yaboot-stubfuncs-patch;</userinput></screen>
+ 
++    <para os="p5">The following patch adds Parted support to yabootconfig:</para>
++
++<screen os="p6"><userinput>patch -Np1 -i ../&yaboot-parted-patch;</userinput></screen>
++
+     <para os="a">The supplied man pages have <filename
+     class="directory">/usr/local</filename> in the text. This sed will correct
+     that:</para>
+diff --git a/BOOK/final-system/ppc64-64/yaboot.xml b/BOOK/final-system/ppc64-64/yaboot.xml
+index 9162c9d..bd8bb45 100644
+--- a/BOOK/final-system/ppc64-64/yaboot.xml
++++ b/BOOK/final-system/ppc64-64/yaboot.xml
+@@ -70,6 +70,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p5'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p6'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../ppc/yaboot.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff --git a/BOOK/final-system/ppc64/yaboot.xml b/BOOK/final-system/ppc64/yaboot.xml
+index 7d28dd1..f2884c3 100644
+--- a/BOOK/final-system/ppc64/yaboot.xml
++++ b/BOOK/final-system/ppc64/yaboot.xml
+@@ -73,6 +73,14 @@
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p5'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../ppc/yaboot.xml"
++    xpointer="xpointer(//*[@os='p6'])"/>
++
++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
++    href="../ppc/yaboot.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
+ 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+diff --git a/BOOK/general.ent b/BOOK/general.ent
+index 9b572d3..13f3047 100644
+--- a/BOOK/general.ent
++++ b/BOOK/general.ent
+@@ -2,13 +2,13 @@
+ 
+ <!ENTITY month "10"> <!-- Use two digits -->
+ <!ENTITY month_name "October">
+-<!ENTITY day "06"> <!-- Use two digits -->
++<!ENTITY day "24"> <!-- Use two digits -->
+ <!ENTITY year "2013"> <!-- Use four digits -->
+ 
+ <!ENTITY releasedate "&month_name; &day;, &year;">
+ 
+ <!ENTITY major-version "2">
+-<!ENTITY minor-version "1">
++<!ENTITY minor-version "2">
+ <!ENTITY extra-version "0">
+ <!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
+ 
+diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
+index 7e417bf..63473c2 100644
+--- a/BOOK/introduction/common/changelog.xml
++++ b/BOOK/introduction/common/changelog.xml
+@@ -57,6 +57,24 @@
+     </listitem>
+ -->
+     <listitem>
++      <para>20 October 2013</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Add a bison eof fix patch for test suite completion.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
++      <para>06 October 2013</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Fix shm umount during end section reboot.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
+       <para>24 September 2013</para>
+       <itemizedlist>
+         <listitem>
+diff --git a/BOOK/introduction/ppc/changelog.xml b/BOOK/introduction/ppc/changelog.xml
+index 6060b60..7e1aaf5 100644
+--- a/BOOK/introduction/ppc/changelog.xml
++++ b/BOOK/introduction/ppc/changelog.xml
+@@ -33,6 +33,15 @@
+ 
+ -->
+     <listitem>
++      <para>20 October 2013</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Add yaboot patch for parted support with yabootconfig.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
+       <para>24 April 2013</para>
+       <itemizedlist>
+         <listitem>
+diff --git a/BOOK/introduction/ppc64-64/changelog.xml b/BOOK/introduction/ppc64-64/changelog.xml
+index 1b920d4..83fe115 100644
+--- a/BOOK/introduction/ppc64-64/changelog.xml
++++ b/BOOK/introduction/ppc64-64/changelog.xml
+@@ -33,6 +33,15 @@
+ 
+ -->
+     <listitem>
++      <para>20 October 2013</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Add yaboot patch for parted support with yabootconfig.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
+       <para>15 August 2013</para>
+       <itemizedlist>
+         <listitem>
+diff --git a/BOOK/introduction/ppc64/changelog.xml b/BOOK/introduction/ppc64/changelog.xml
+index 3d81ed7..e014ac5 100644
+--- a/BOOK/introduction/ppc64/changelog.xml
++++ b/BOOK/introduction/ppc64/changelog.xml
+@@ -33,6 +33,15 @@
+ 
+ -->
+     <listitem>
++      <para>20 October 2013</para>
++      <itemizedlist>
++        <listitem>
++          <para>[William Harrington] - Add yaboot patch for parted support with yabootconfig.</para>
++        </listitem>
++      </itemizedlist>
++    </listitem>
++
++    <listitem>
+       <para>24 April 2013</para>
+       <itemizedlist>
+         <listitem>
+diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
+index ea1ecdb..5bedc2f 100644
+--- a/BOOK/materials/common/patches.xml
++++ b/BOOK/materials/common/patches.xml
+@@ -38,6 +38,15 @@
+     </varlistentry>
+ -->
+ 
++    <varlistentry os="bison-eof-patch">
++      <term>Bison EOF Fix Patch - <token>&bison-eof-patch-size;</token>:</term>
++      <listitem>
++        <para>Download: <ulink
++        url="&patches-root;&bison-eof-patch;"/></para>
++        <para>MD5 sum: <literal>&bison-eof-patch-md5;</literal></para>
++      </listitem>
++    </varlistentry>
++
+     <varlistentry>
+       <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
+       <listitem>
+diff --git a/BOOK/materials/ppc/patches.xml b/BOOK/materials/ppc/patches.xml
+index 4bea697..80bf2ff 100644
+--- a/BOOK/materials/ppc/patches.xml
++++ b/BOOK/materials/ppc/patches.xml
+@@ -43,6 +43,15 @@
+       </listitem>
+     </varlistentry>
+ 
++    <varlistentry os="yaboot-parted-patch">
++      <term>Yaboot Parted Patch - <token>&yaboot-parted-patch-size;</token>:</term>
++      <listitem>
++        <para>Download: <ulink
++        url="&patches-root;&yaboot-parted-patch;"/></para>
++        <para>MD5 sum: <literal>&yaboot-parted-patch-md5;</literal></para>
++      </listitem>
++    </varlistentry>
++
+     <varlistentry os="yaboot-stubfuncs-patch">
+       <term>Yaboot Stubfuncs Patch - <token>&yaboot-stubfuncs-patch-size;</token>:</term>
+       <listitem>
+diff --git a/BOOK/patches.ent b/BOOK/patches.ent
+index 7e6e755..868756b 100644
+--- a/BOOK/patches.ent
++++ b/BOOK/patches.ent
+@@ -14,6 +14,10 @@
+ <!ENTITY binutils-branch_update-patch-size "5,268 KB">
+ -->
+ 
++<!ENTITY bison-eof-patch "bison-&bison-version;-fix_eof-1.patch">
++<!ENTITY bison-eof-patch-md5 "6a4c0a61615ed0db204d279ed6880ae3">
++<!ENTITY bison-eof-patch-size "1.150 KB">
++
+ <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
+ <!ENTITY coreutils-uname-patch-md5 "5d3a1f7196c9c07033bbd2853885fda2">
+ <!ENTITY coreutils-uname-patch-size "4.8 KB">
+@@ -152,6 +156,10 @@
+ <!ENTITY yaboot-ofpath_path-patch-md5 "3faf70e0cb4e4f62a1e8815c3452ab38">
+ <!ENTITY yaboot-ofpath_path-patch-size ".830 KB">
+ 
++<!ENTITY yaboot-parted-patch "yaboot-&yaboot-version;-parted-1.patch">
++<!ENTITY yaboot-parted-patch-md5 "af05081b2056f0070b8b057acc32fea5">
++<!ENTITY yaboot-parted-patch-size "1.245 KB">
++
+ <!ENTITY yaboot-stubfuncs-patch "yaboot-&yaboot-version;-stubfuncs-1.patch">
+ <!ENTITY yaboot-stubfuncs-patch-md5 "b5cc91f9904383c24848040bfe6f11ae">
+ <!ENTITY yaboot-stubfuncs-patch-size "4.2 KB">
+diff --git a/patches/bison-3.0-fix_eof-1.patch b/patches/bison-3.0-fix_eof-1.patch
+new file mode 100644
+index 0000000..c87acdd
+--- /dev/null
++++ b/patches/bison-3.0-fix_eof-1.patch
+@@ -0,0 +1,32 @@
++Submitted By: Ken Moffat (zrniwhoop at ntlworld dot com)
++Date: 2013-10-16
++Initial Package Version: 3.0
++Origin: Upstream
++Upstream Status: Applied
++Description: Fixes EOF check.
++
++commit 4c4191cec2b30632a31993a6e46fb241ab9c3434
++
++Author: Andreas Schwab <schwab at linux-m68k.org>
++Date:   Sat Sep 28 00:00:34 2013 +0200
++                                      
++    location: fix EOF check           
++                           
++    * location.c (location_caret): Use int, not char, for values from
++    getc.                                                            
++
++ found at http://git.savannah.gnu.org/cgit/bison.git/diff/src/location.c?id=4c4191cec2b30632a31993a6e46fb241ab9c3434&ignorews=1
++ copied and pasted.
++
++--- bison-3.0/src/location.c.orig	2013-10-16 18:02:56.880658070 +0100
+++++ bison-3.0/src/location.c	2013-10-16 18:04:12.676299868 +0100
++@@ -188,7 +188,7 @@
++   /* Read the actual line.  Don't update the offset, so that we keep a pointer
++      to the start of the line.  */
++   {
++-    char c = getc (caret_info.source);
+++    int c = getc (caret_info.source);
++     if (c != EOF)
++       {
++         /* Quote the file, indent by a single column.  */
++
+diff --git a/patches/yaboot-1.3.17-parted-1.patch b/patches/yaboot-1.3.17-parted-1.patch
+new file mode 100644
+index 0000000..f1f6f63
+--- /dev/null
++++ b/patches/yaboot-1.3.17-parted-1.patch
+@@ -0,0 +1,36 @@
++Submitted By: William Harrington kb0iic at cross-lfs dot org 
++Date: 2013-10-20
++Initial Package Version: 1.3.10
++Upstream Status: Unknown
++Origin: https://bugzilla.redhat.com/show_bug.cgi?id=121361
++Description: Add parted support to yabootconfig.
++
++--- yaboot-1.3.10/ybin/yabootconfig~	2004-04-20 16:20:13.619375616 -0400
+++++ yaboot-1.3.10/ybin/yabootconfig	2004-04-20 16:32:40.519829488 -0400
++@@ -160,6 +160,8 @@
++ 	FDISK=mac-fdisk
++     elif (command -v pdisk > /dev/null 2>&1) ; then
++ 	FDISK=pdisk
+++    elif (command -v parted > /dev/null 2>&1) ; then
+++	FDISK=parted
++     else
++ 	echo 1>&2 "$PRG: Unable to locate mac-fdisk"
++ 	return 1
++@@ -209,9 +211,16 @@
++ 		BOOT="${DISK}${BOOT}"
++ 	    fi
++ 	    debug "BOOT after fixup: $BOOT\n"
++-	else
+++	elif [ "$FDISK" = mac-fdisk ] ; then
++ 	    BOOT="$(v=`$FDISK -l "$DISK" 2>/dev/null | grep '\<Apple_Bootstrap\>'` ; echo ${v%%[ ]*})"
++ 	    debug "BOOT=$BOOT\n"
+++	else
+++	    BOOT="$(v=`$FDISK "$DISK" print 2>/dev/null | grep 'bootstrap'` ; echo ${v%%[ ]*})"
+++	    debug "BOOT before fixup: $BOOT\n"
+++	    if [ -n "$BOOT" ] ; then
+++		BOOT="${DISK}${BOOT}"
+++	    fi
+++	    debug "BOOT after fixup: $BOOT\n"
++ 	fi
++ 	if [ -z "$BOOT" ] ; then
++ 	    echo 1>&2 "$PRG: Unable to locate bootstrap partition on $DISK..."




More information about the lfs-traducfr mailing list