Author: krejzi
Date: Fri Feb 6 16:34:45 2015
New Revision: 10831
Log:
Merged latest change from trunk.
Modified:
branches/systemd/chapter01/changelog.xml
branches/systemd/chapter01/whatsnew.xml
branches/systemd/chapter03/patches.xml
branches/systemd/chapter06/bash.xml
branches/systemd/patches.ent
Modified: branches/systemd/chapter01/changelog.xml
==============================================================================
--- branches/systemd/chapter01/changelog.xml Fri Feb 6 16:33:39 2015
(r10830)
+++ branches/systemd/chapter01/changelog.xml Fri Feb 6 16:34:45 2015
(r10831)
@@ -39,6 +39,12 @@
<para>2015-02-06</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Add bash patches through patch-033.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update mpfr patches through patch-11.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Update to util-linux-2.26-rc2. Intermediate
fix prior to stable util-linux-2.26.</para>
</listitem>
Modified: branches/systemd/chapter01/whatsnew.xml
==============================================================================
--- branches/systemd/chapter01/whatsnew.xml Fri Feb 6 16:33:39 2015
(r10830)
+++ branches/systemd/chapter01/whatsnew.xml Fri Feb 6 16:34:45 2015
(r10831)
@@ -239,11 +239,13 @@
<title>Added:</title>
<listitem><para></para></listitem> <!-- satisfy build -->
- <!--
<listitem>
<para>&bash-fixes-patch;</para>
</listitem>
- -->
+
+ <listitem>
+ <para>&mpfr-fixes-patch;</para>
+ </listitem>
<listitem>
<para>&perl-fix-patch;</para>
Modified: branches/systemd/chapter03/patches.xml
==============================================================================
--- branches/systemd/chapter03/patches.xml Fri Feb 6 16:33:39 2015
(r10830)
+++ branches/systemd/chapter03/patches.xml Fri Feb 6 16:34:45 2015
(r10831)
@@ -17,7 +17,7 @@
needed to build an LFS system:</para>
<variablelist role="materials">
-<!--
+
<varlistentry>
<term>Bash Upstream Fixes Patch -
<token>&bash-fixes-patch-size;</token>:</term>
<listitem>
@@ -25,7 +25,7 @@
<para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
--->
+
<varlistentry>
<term>Bc Memory Leak Patch -
<token>&bc-memory-leak-patch-size;</token>:</term>
<listitem>
Modified: branches/systemd/chapter06/bash.xml
==============================================================================
--- branches/systemd/chapter06/bash.xml Fri Feb 6 16:33:39 2015 (r10830)
+++ branches/systemd/chapter06/bash.xml Fri Feb 6 16:34:45 2015 (r10831)
@@ -39,12 +39,12 @@
<sect2 role="installation">
<title>Installation of Bash</title>
-<!--
+
<para>First, apply the following patch to fix various bugs that have been
addressed upstream:</para>
<screen><userinput remap="pre">patch -Np1 -i
../&bash-fixes-patch;</userinput></screen>
--->
+
<para>Prepare Bash for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr
\
Modified: branches/systemd/patches.ent
==============================================================================
--- branches/systemd/patches.ent Fri Feb 6 16:33:39 2015 (r10830)
+++ branches/systemd/patches.ent Fri Feb 6 16:34:45 2015 (r10831)
@@ -2,6 +2,10 @@
<!-- Start of Common Patches -->
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "e2571929a43fdf76ae1eb683fe86b5c0">
+<!ENTITY bash-fixes-patch-size "8.8 KB">
+
<!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
<!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
<!ENTITY bc-memory-leak-patch-size "1.4 KB">
@@ -22,9 +26,9 @@
<!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
<!ENTITY kbd-backspace-patch-size "12 KB">
-<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-2.patch">
-<!ENTITY mpfr-fixes-patch-md5 "2b2aa4371a4e848411639356fd82becf">
-<!ENTITY mpfr-fixes-patch-size "40 KB">
+<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-3.patch">
+<!ENTITY mpfr-fixes-patch-md5 "5ba8bafe42920d6e570567529629bc59">
+<!ENTITY mpfr-fixes-patch-size "38 KB">
<!ENTITY perl-fix-patch "perl-&perl-version;-infinite_recurse_fix-1.patch">
<!ENTITY perl-fix-patch-md5 "579dfed34e97e0a2fe21b74aa53946ac">
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
