r867 - in trunk/BOOK: . final-system/common final-system/multilib introduction/common materials/common temp-system/common temp-system/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Dec 7 13:30:11 PST 2005


Author: jim
Date: 2005-12-07 14:30:00 -0700 (Wed, 07 Dec 2005)
New Revision: 867

Modified:
   trunk/BOOK/
   trunk/BOOK/final-system/common/bash.xml
   trunk/BOOK/final-system/multilib/bash.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/materials/common/patches.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/patches.ent
   trunk/BOOK/temp-system/common/bash.xml
   trunk/BOOK/temp-system/multilib/bash.xml
Log:
 r1009 at server:  jim | 2005-12-07 13:20:43 -0800
 Upgraded to Bash 3.0.16



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1008
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1009
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/final-system/common/bash.xml
===================================================================
--- trunk/BOOK/final-system/common/bash.xml	2005-12-07 21:29:51 UTC (rev 866)
+++ trunk/BOOK/final-system/common/bash.xml	2005-12-07 21:30:00 UTC (rev 867)
@@ -40,17 +40,6 @@
 sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
     Makefile.in</userinput></screen>
 
-    <para os="c">The following patch fixes various issues, including a problem where
-    Bash will sometimes only show 33 characters on a line, then wrap to the
-    next:</para>
-
-<screen os="d"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
-    <para os="e">Bash also has an issue when compiled against newer versions of Glibc.
-    The following patch resolves this problem:</para>
-
-<screen os="f"><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
-
     <para os="g">Prepare Bash for compilation:</para>
 
 <screen os="h"><userinput>./configure --prefix=/usr --bindir=/bin \

Modified: trunk/BOOK/final-system/multilib/bash.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bash.xml	2005-12-07 21:29:51 UTC (rev 866)
+++ trunk/BOOK/final-system/multilib/bash.xml	2005-12-07 21:30:00 UTC (rev 867)
@@ -31,22 +31,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-12-07 21:29:51 UTC (rev 866)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-12-07 21:30:00 UTC (rev 867)
@@ -50,6 +50,10 @@
           <para>[jim] - Upgraded to Readline 5.0.5.</para>
         </listitem>
       </itemizedlist>
+        <listitem>
+          <para>[jim] - Upgraded to Bash 3.0.16.</para>
+        </listitem>
+      </itemizedlist>
     </listitem>
 
     <listitem>

Modified: trunk/BOOK/materials/common/patches.xml
===================================================================
--- trunk/BOOK/materials/common/patches.xml	2005-12-07 21:29:51 UTC (rev 866)
+++ trunk/BOOK/materials/common/patches.xml	2005-12-07 21:30:00 UTC (rev 867)
@@ -18,22 +18,6 @@
 
   <variablelist role="materials">
 
-    <varlistentry os="p1">
-      <term>Bash Avoid Wcontinued Patch - 1.3 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;bash/&bash-avoid_WCONTINUED-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="p2">
-      <term>Bash Various Fixes - 23 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;bash/&bash-fixes-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="p3">
       <term>Binutils Posix Patch - 4.9 KB:</term>
       <listitem>

Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent	2005-12-07 21:29:51 UTC (rev 866)
+++ trunk/BOOK/packages.ent	2005-12-07 21:30:00 UTC (rev 867)
@@ -16,8 +16,8 @@
 <!ENTITY automake-size "748 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
 
-<!ENTITY bash-version "3.0">
-<!ENTITY bash-size "2.4 MB">
+<!ENTITY bash-version "3.0.16">
+<!ENTITY bash-size "2.3 MB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
 
 <!ENTITY bash-doc-version "3.0">

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2005-12-07 21:29:51 UTC (rev 866)
+++ trunk/BOOK/patches.ent	2005-12-07 21:30:00 UTC (rev 867)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch">
-<!ENTITY bash-avoid_WCONTINUED-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch">
-
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
 

Modified: trunk/BOOK/temp-system/common/bash.xml
===================================================================
--- trunk/BOOK/temp-system/common/bash.xml	2005-12-07 21:29:51 UTC (rev 866)
+++ trunk/BOOK/temp-system/common/bash.xml	2005-12-07 21:30:00 UTC (rev 867)
@@ -29,14 +29,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen os="h"><userinput>./configure --prefix=/tools --with-curses \

Modified: trunk/BOOK/temp-system/multilib/bash.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/bash.xml	2005-12-07 21:29:51 UTC (rev 866)
+++ trunk/BOOK/temp-system/multilib/bash.xml	2005-12-07 21:30:00 UTC (rev 867)
@@ -32,14 +32,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \




More information about the cross-lfs mailing list