[Clfs-commits] commit: r4735 - in /trunk: BOOK/ BOOK/final-system/common/ BOOK/final-system/multilib/ BOOK/introduction/common/ BOOK/materials/common/ BOOK/temp-system/common/ BOOK/temp-system/multilib/ patches/
svn at cross-lfs.org
svn at cross-lfs.org
Fri Feb 20 19:37:50 PST 2009
Author: jim
Date: Sat Feb 21 03:37:50 2009
New Revision: 4735
Log:
Updated Bash 4.0
Removed:
trunk/patches/bash-3.2-branch_update-1.patch
trunk/patches/bash-3.2-fixes-10.patch
Modified:
trunk/BOOK/final-system/common/bash.xml
trunk/BOOK/final-system/multilib/bash.xml
trunk/BOOK/introduction/common/changelog.xml
trunk/BOOK/materials/common/packages.xml
trunk/BOOK/materials/common/patches.xml
trunk/BOOK/packages.ent
trunk/BOOK/temp-system/common/bash.xml
trunk/BOOK/temp-system/multilib/bash.xml
Modified: trunk/BOOK/final-system/common/bash.xml
==============================================================================
--- trunk/BOOK/final-system/common/bash.xml (original)
+++ trunk/BOOK/final-system/common/bash.xml Sat Feb 21 03:37:50 2009
@@ -24,27 +24,18 @@
<sect2 role="installation">
<title>Installation of Bash</title>
- <para os="a">If you downloaded the Bash documentation tarball and wish to
- install HTML documentation, issue the following command:</para>
-
-<screen os="b"><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz</userinput></screen>
-
+<!--
<para os="p1">The following patch contains updates from the maintainer. The
maintainer of Bash only releases these patches to fix serious issues:</para>
<screen os="p2"><userinput>patch -Np1 -i ../&bash-branch_update-patch;</userinput></screen>
+-->
+ <para os="a">Prepare Bash for compilation:</para>
- <para os="p3">The following patch contains fixes that affect a CLFS system. These are
- validated issues by the CLFS developers:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
- <para os="g">Prepare Bash for compilation:</para>
-
-<screen os="h"><userinput>./configure --prefix=/usr --bindir=/bin \
+<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
--without-bash-malloc --with-installed-readline</userinput></screen>
- <variablelist os="i">
+ <variablelist os="c">
<title>The meaning of the configure option:</title>
<varlistentry>
@@ -58,23 +49,23 @@
</varlistentry>
</variablelist>
- <para os="j">Compile the package:</para>
+ <para os="d">Compile the package:</para>
-<screen os="k"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
- <para os="l">To test the results, issue:
+ <para os="f">To test the results, issue:
<userinput>make tests</userinput>.</para>
- <para os="m">Install the package:</para>
+ <para os="g">Install the package:</para>
-<screen os="n"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
+<screen os="h"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
- <para os="o">Run the newly compiled <command>bash</command> program (replacing
+ <para os="i">Run the newly compiled <command>bash</command> program (replacing
the one that is currently being executed):</para>
-<screen os="p" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
+<screen os="j" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
- <note os="q">
+ <note os="k">
<para>The parameters used make the <command>bash</command>
process an interactive login shell and continue to disable hashing so
that new programs are found as they become available.</para>
Modified: trunk/BOOK/final-system/multilib/bash.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/bash.xml (original)
+++ trunk/BOOK/final-system/multilib/bash.xml Sat Feb 21 03:37:50 2009
@@ -21,14 +21,7 @@
<sect2 role="installation">
<title>Installation of Bash</title>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -36,14 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='p3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='p4'])"/>
+-->
<para os="m1">The following sed points configure towards the correct
library directory while searching for Readline:</para>
@@ -52,11 +38,35 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+ ./configure --prefix=/usr --bindir=/bin \
+ --without-bash-malloc --with-installed-readline</userinput></screen>
+
+ <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}" \
- ./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc --with-installed-readline</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/bash.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
@@ -70,30 +80,6 @@
href="../common/bash.xml"
xpointer="xpointer(//*[@os='k'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='l'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='m'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='n'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='o'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='p'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='q'])"/>
-
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Sat Feb 21 03:37:50 2009
@@ -35,6 +35,15 @@
</itemizedlist>
</listitem>
-->
+
+ <listitem>
+ <para>February 20, 2009</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Jim] - Updated Bash to 4.0.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>February 19, 2009</para>
Modified: trunk/BOOK/materials/common/packages.xml
==============================================================================
--- trunk/BOOK/materials/common/packages.xml (original)
+++ trunk/BOOK/materials/common/packages.xml Sat Feb 21 03:37:50 2009
@@ -38,15 +38,6 @@
<para>Home page: <ulink url="&bash-home;"/></para>
<para>Download: <ulink url="&bash-url;"/></para>
<para>MD5 sum: <literal>&bash-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Bash Documentation (&bash-doc-version;) - <token>&bash-doc-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&bash-doc-home;"/></para>
- <para>Download: <ulink url="&bash-doc-url;"/></para>
- <para>MD5 sum: <literal>&bash-doc-md5;</literal></para>
</listitem>
</varlistentry>
Modified: trunk/BOOK/materials/common/patches.xml
==============================================================================
--- trunk/BOOK/materials/common/patches.xml (original)
+++ trunk/BOOK/materials/common/patches.xml Sat Feb 21 03:37:50 2009
@@ -18,6 +18,7 @@
<variablelist role="materials">
+<!--
<varlistentry>
<term>Bash Branch Update Patch - <token>&bash-branch_update-patch-size;</token>:</term>
<listitem>
@@ -26,15 +27,7 @@
<para>MD5 sum: <literal>&bash-branch_update-patch-md5;</literal></para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term>Bash Fixes - <token>&bash-fixes-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&bash-fixes-patch;"/></para>
- <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
+-->
<!--
<varlistentry>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent (original)
+++ trunk/BOOK/packages.ent Sat Feb 21 03:37:50 2009
@@ -30,17 +30,11 @@
<!ENTITY automake-md5 "95204606899120f10de99112075a4b6d">
<!ENTITY automake-home "&gnu-software;automake">
-<!ENTITY bash-version "3.2">
-<!ENTITY bash-size "2,470 KB">
+<!ENTITY bash-version "4.0">
+<!ENTITY bash-size "6,038 KB">
<!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "00bfa16d58e034e3c2aa27f390390d30">
+<!ENTITY bash-md5 "a90a1b5a6db4838483f05438e05e8eb9">
<!ENTITY bash-home "&gnu-software;bash">
-
-<!ENTITY bash-doc-version "3.2">
-<!ENTITY bash-doc-size "2,143 KB">
-<!ENTITY bash-doc-url "&gnu;bash/bash-doc-&bash-doc-version;.tar.gz">
-<!ENTITY bash-doc-md5 "0e904cb46ca873fcfa65df19b024bec9">
-<!ENTITY bash-doc-home " ">
<!ENTITY bin86-version "0.16.17">
<!ENTITY bin86-size "148 KB">
Modified: trunk/BOOK/temp-system/common/bash.xml
==============================================================================
--- trunk/BOOK/temp-system/common/bash.xml (original)
+++ trunk/BOOK/temp-system/common/bash.xml Sat Feb 21 03:37:50 2009
@@ -22,6 +22,7 @@
<sect2 role="installation">
<title>Installation of Bash</title>
+<!--
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,8 +30,9 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='p2'])"/>
+-->
- <para os="c1">When bash is cross-compiled, it cannot test for the presence
+ <para os="t1">When bash is cross-compiled, it cannot test for the presence
of named pipes, amoung other things. If you used <command>su</command> to
become an unprivileged user, this combination will cause Bash to build
without <emphasis>process substitution</emphasis>, which will break one
@@ -38,7 +40,7 @@
future problems by skipping tests that can not run while cross-compiling
or that do not run properly:</para>
-<screen os="c2"><userinput>cat > config.cache << "EOF"
+<screen os="t2"><userinput>cat > config.cache << "EOF"
ac_cv_func_mmap_fixed_mapped=yes
ac_cv_func_strcoll_works=yes
ac_cv_func_working_mktime=yes
@@ -55,13 +57,13 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/common/bash.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ xpointer="xpointer(//*[@os='a'])"/>
-<screen os="h"><userinput>./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--without-bash-malloc --cache-file=config.cache</userinput></screen>
- <variablelist os="ad">
+ <variablelist os="c">
<title>The meaning of the configure option:</title>
<varlistentry>
@@ -78,22 +80,22 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/common/bash.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/common/bash.xml"
- xpointer="xpointer(//*[@os='k'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/common/bash.xml"
- xpointer="xpointer(//*[@os='m'])"/>
+ xpointer="xpointer(//*[@os='g'])"/>
-<screen os="n"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
- <para os="ae">Make a link for programs that use <command>sh</command> for
+ <para os="t3">Make a link for programs that use <command>sh</command> for
a shell:</para>
-<screen os="af"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
+<screen os="t4"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
</sect2>
Modified: trunk/BOOK/temp-system/multilib/bash.xml
==============================================================================
--- trunk/BOOK/temp-system/multilib/bash.xml (original)
+++ trunk/BOOK/temp-system/multilib/bash.xml Sat Feb 21 03:37:50 2009
@@ -22,6 +22,7 @@
<sect2 role="installation">
<title>Installation of Bash</title>
+<!--
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,51 +30,52 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='p2'])"/>
+-->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='c1'])"/>
+ xpointer="xpointer(//*[@os='t1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='c2'])"/>
+ xpointer="xpointer(//*[@os='t2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ xpointer="xpointer(//*[@os='a'])"/>
-<screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--without-bash-malloc --cache-file=config.cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='ad'])"/>
+ xpointer="xpointer(//*[@os='c'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='k'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='m'])"/>
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='n'])"/>
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='ae'])"/>
+ xpointer="xpointer(//*[@os='t3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/bash.xml"
- xpointer="xpointer(//*[@os='af'])"/>
+ xpointer="xpointer(//*[@os='t4'])"/>
</sect2>
More information about the Clfs-commits
mailing list