aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Trepl <thomas@linuxfromscratch.org>2019-12-02 12:18:16 +0000
committerThomas Trepl <thomas@linuxfromscratch.org>2019-12-02 12:18:16 +0000
commit71ab47c132cdb3da0e22324451cf9d30ab12d6fb (patch)
treea94f4aff27ec50d0b15bca0f25ba480a52784f91
parent866a915414f66095b080d3cbfaa2ca06a4a4c5cb (diff)
MultiLib: Merge changes from trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11703 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml51
-rw-r--r--chapter01/whatsnew.xml19
-rw-r--r--chapter03/patches.xml4
-rw-r--r--chapter04/addinguser.xml5
-rw-r--r--chapter06/bash.xml4
-rw-r--r--chapter06/libelf.xml7
-rw-r--r--chapter06/libffi.xml6
-rw-r--r--chapter06/python.xml2
-rw-r--r--general.ent6
-rw-r--r--packages.ent62
-rw-r--r--patches.ent8
11 files changed, 119 insertions, 55 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7bd5fd605..70d4cfd76 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -54,6 +54,57 @@
</listitem>
<listitem revision="sysv">
+ <para>2019-12-01</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Add upstream fixes patch for bash.
+ Also add a note about possible problems when changing
+ to the lfs user.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to vim-8.1.2361. Updates
+ <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to meson-0.52.1. Fixes
+ <ulink url="&lfs-ticket-root;4555">#4555</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to elfutils-0.178. Fixes
+ <ulink url="&lfs-ticket-root;4553">#4553</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to iproute2-5.4.0. Fixes
+ <ulink url="&lfs-ticket-root;4551">#4551</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to libffi-3.3. Fixes
+ <ulink url="&lfs-ticket-root;4550">#4550</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to tcl-8.6.10. Fixes
+ <ulink url="&lfs-ticket-root;4549">#4549</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to man-pages-5.04. Fixes
+ <ulink url="&lfs-ticket-root;4548">#4548</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to perl-5.30.1. Fixes
+ <ulink url="&lfs-ticket-root;4547">#4547</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to linux-5.4.1. Fixes
+ <ulink url="&lfs-ticket-root;4546">#4546</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to bc-2.3.2. Fixes
+ <ulink url="&lfs-ticket-root;4545">#4545</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2019-11-08</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index d38632ae9..8712db19d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -149,9 +149,12 @@
<!--<listitem>
<para>Libcap-&libcap-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Libelf-&elfutils-version; (from elfutils)</para>
- </listitem>-->
+ </listitem>
+ <listitem>
+ <para>Libffi-&libffi-version;</para>
+ </listitem>
<!--<listitem>
<para>Libpipeline-&libpipeline-version;</para>
</listitem>-->
@@ -197,9 +200,9 @@
<!-- <listitem>
<para>Patch-&patch-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Perl-&perl-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Pkg-config-&pkgconfig-version;</para>
</listitem>-->
@@ -233,9 +236,9 @@
<!--<listitem>
<para>Tar-&tar-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Tcl-&tcl-version;</para>
- </listitem>-->
+ </listitem>
<listitem>
<para>Texinfo-&texinfo-version;</para>
</listitem>
@@ -245,9 +248,9 @@
<!--<listitem>
<para>Util-Linux-&util-linux-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Vim-&vim-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>XML-Parser-&xml-parser-version;</para>
</listitem>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 949b032ab..bd5fa7acd 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -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>
diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml
index bd84aa770..2c1b1ebec 100644
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@ -88,6 +88,11 @@ useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen>
<screen><userinput>chown -v lfs $LFS/sources</userinput></screen>
+ <note><para>In some host systems, the following command does not complete
+ properly and suspends the login to the lfs user to the background. If the
+ prompt "lfs:~$" does not appear immediately, entering the
+ <command>fg</command> command will fix the issue.</para></note>
+
<para>Next, login as user <systemitem class="username">lfs</systemitem>.
This can be done via a virtual console, through a display manager, or with
the following substitute user command:</para>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 74b39dc32..adeec10a4 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -39,11 +39,11 @@
<sect2 role="installation">
<title>Installation of Bash</title>
-<!--
+
<para>Incorporate some upstream fixes:</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 \
diff --git a/chapter06/libelf.xml b/chapter06/libelf.xml
index 1dc1278d6..41e8cfd70 100644
--- a/chapter06/libelf.xml
+++ b/chapter06/libelf.xml
@@ -46,7 +46,7 @@
<para>Prepare Libelf for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-debuginfod</userinput></screen>
<para>Compile the package:</para>
@@ -56,10 +56,13 @@
<screen><userinput remap="test">make check</userinput></screen>
+ <para>One test, run-elfclassify.sh, is known to fail.</para>
+
<para>Install only Libelf:</para>
<screen><userinput remap="install">make -C libelf install
-install -vm644 config/libelf.pc /usr/lib/pkgconfig</userinput></screen>
+install -vm644 config/libelf.pc /usr/lib/pkgconfig
+rm /usr/lib/libelf.a</userinput></screen>
</sect2>
diff --git a/chapter06/libffi.xml b/chapter06/libffi.xml
index d424531e0..a363187d7 100644
--- a/chapter06/libffi.xml
+++ b/chapter06/libffi.xml
@@ -49,7 +49,7 @@
If this is not done, all applications that link to libffi will trigger
Illegal Operation Errors.</para>
</note>
-
+<!--
<para>Modify the Makefile to install headers into the standard
<filename class="directory">/usr/include</filename> directory instead of
<filename class="directory">/usr/lib/libffi-&libffi-version;/include</filename>.</para>
@@ -60,7 +60,7 @@
sed -e '/^includedir/ s/=.*$/=@includedir@/' \
-e 's/^Cflags: -I${includedir}/Cflags:/' \
-i libffi.pc.in</userinput></screen>
-
+-->
<para>Prepare libffi for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --disable-static --with-gcc-arch=native</userinput></screen>
@@ -92,6 +92,8 @@ sed -e '/^includedir/ s/=.*$/=@includedir@/' \
<screen><userinput remap="test">make check</userinput></screen>
+ <para>Six tests, all related to test-callback.c, are known to fail.</para>
+
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter06/python.xml b/chapter06/python.xml
index d29f664e9..5718a28a9 100644
--- a/chapter06/python.xml
+++ b/chapter06/python.xml
@@ -120,7 +120,7 @@ tar --strip-components=1 \
<title>The meaning of the documentation install commands:</title>
<varlistentry>
- <term><option>--no-same-owner</option> and --no-same-permissions</term>
+ <term><option>--no-same-owner</option> and <option>--no-same-permissions</option></term>
<listitem>
<para>Ensure the installed files have the correct ownership and
permissions. Without these options, using <application>tar</application>
diff --git a/general.ent b/general.ent
index 5a734534f..9747fa026 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20191108">
+<!ENTITY version "SVN-20191201">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20191108-systemd">
+<!ENTITY versiond "20191201-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "November 8th, 2019">
+<!ENTITY releasedate "December 1st, 2019">
<!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "9.0">
diff --git a/packages.ent b/packages.ent
index 1ebdeb87c..d4e0c8654 100644
--- a/packages.ent
+++ b/packages.ent
@@ -50,10 +50,10 @@
<!ENTITY bash-ch6-du "62 MB">
<!ENTITY bash-ch6-sbu "2.1 SBU">
-<!ENTITY bc-version "2.2.0">
-<!ENTITY bc-size "236 KB">
+<!ENTITY bc-version "2.3.2">
+<!ENTITY bc-size "242 KB">
<!ENTITY bc-url "https://github.com/gavinhoward/bc/archive/&bc-version;/bc-&bc-version;.tar.gz">
-<!ENTITY bc-md5 "0de4a7b7592e1d7e12f9f601477fe081">
+<!ENTITY bc-md5 "89e9063e852b3f84b010b836f815f88f">
<!ENTITY bc-home "https://github.com/gavinhoward/bc">
<!ENTITY bc-ch6-du "2.8 MB">
<!ENTITY bc-ch6-sbu "0.1 SBU">
@@ -151,10 +151,10 @@
<!ENTITY e2fsprogs-ch6-du "108 MB">
<!ENTITY e2fsprogs-ch6-sbu "3.1 SBU">
-<!ENTITY elfutils-version "0.177">
-<!ENTITY elfutils-size "8,645 KB">
+<!ENTITY elfutils-version "0.178">
+<!ENTITY elfutils-size "8,797 KB">
<!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
-<!ENTITY elfutils-md5 "0b583722f911e1632544718d502aab87">
+<!ENTITY elfutils-md5 "5480d0b7174446aba13a6adde107287f">
<!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/">
<!ENTITY elfutils-ch6-du "95 MB">
<!ENTITY elfutils-ch6-sbu "1.1 SBU">
@@ -348,10 +348,10 @@
<!ENTITY intltool-ch6-du "1.5 MB">
<!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
-<!ENTITY iproute2-version "5.3.0">
-<!ENTITY iproute2-size "726 KB">
+<!ENTITY iproute2-version "5.4.0">
+<!ENTITY iproute2-size "724 KB">
<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "227404413c8d6db649d6188ead1e5a6e">
+<!ENTITY iproute2-md5 "54d86cadb4cd1d19fd7114b4e53adf51">
<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
<!ENTITY iproute2-ch6-du "13 MB">
<!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -404,10 +404,10 @@
<!ENTITY libcap-ch6-du "1.5 MB">
<!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
-<!ENTITY libffi-version "3.2.1">
-<!ENTITY libffi-size "920 KB">
+<!ENTITY libffi-version "3.3">
+<!ENTITY libffi-size "1,275 KB">
<!ENTITY libffi-url "ftp://sourceware.org/pub/libffi/libffi-&libffi-version;.tar.gz">
-<!ENTITY libffi-md5 "83b89587607e3eb65c70d361f13bab43">
+<!ENTITY libffi-md5 "6313289e32f1d38a9df4770b014a2ca7">
<!ENTITY libffi-home "https://sourceware.org/libffi/">
<!ENTITY libffi-ch6-du "7.6 MB">
<!ENTITY libffi-ch6-sbu "0.4 SBU">
@@ -429,13 +429,13 @@
<!ENTITY libtool-ch6-sbu "1.9 SBU">
<!ENTITY linux-major-version "5">
-<!ENTITY linux-minor-version "3">
-<!ENTITY linux-patch-version "9">
+<!ENTITY linux-minor-version "4">
+<!ENTITY linux-patch-version "1">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "106,036 KB">
+<!ENTITY linux-size "106,871 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "56ebdb30b6816b0cf29ba18f06c89836">
+<!ENTITY linux-md5 "1e62d81b5da8df7c45f6ca159edeeb17">
<!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -484,18 +484,18 @@
<!ENTITY man-db-ch6-du "38 MB">
<!ENTITY man-db-ch6-sbu "0.4 SBU">
-<!ENTITY man-pages-version "5.03">
-<!ENTITY man-pages-size "1,639 KB">
+<!ENTITY man-pages-version "5.04">
+<!ENTITY man-pages-size "1,645 KB">
<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "4a85d16759c883048a1d27c741dadf17">
+<!ENTITY man-pages-md5 "4eb98f597b629f81993c7b71ecab0ab0">
<!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
<!ENTITY man-pages-ch6-du "31 MB">
<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
-<!ENTITY meson-version "0.52.0">
-<!ENTITY meson-size "1,472 KB">
+<!ENTITY meson-version "0.52.1">
+<!ENTITY meson-size "1,473 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "7ea7772414dda8ae11072244bf7ba991">
+<!ENTITY meson-md5 "a5f0c99567d772508f649a28ded7f8ad">
<!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-ch6-du "28 MB">
<!ENTITY meson-ch6-sbu "less than 0.1 SBU">
@@ -552,10 +552,10 @@
<!ENTITY patch-ch6-du "13 MB">
<!ENTITY patch-ch6-sbu "0.2 SBU">
-<!ENTITY perl-version "5.30.0">
-<!ENTITY perl-size "12,129 KB">
+<!ENTITY perl-version "5.30.1">
+<!ENTITY perl-size "12,078 KB">
<!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "037c35000550bdcb47552ad0f6d3064d">
+<!ENTITY perl-md5 "f399f3aaee90ddcff5eadd3bccdaacc0">
<!ENTITY perl-home "https://www.perl.org/">
<!ENTITY perl-ch5-du "275 MB">
<!ENTITY perl-ch5-sbu "1.6 SBU">
@@ -671,11 +671,11 @@
<!ENTITY tar-ch6-du "45 MB">
<!ENTITY tar-ch6-sbu "2.2 SBU">
-<!ENTITY tcl-version "8.6.9">
+<!ENTITY tcl-version "8.6.10">
<!ENTITY tcl-major-version "8.6">
-<!ENTITY tcl-size "9,772 KB">
+<!ENTITY tcl-size "9,907 KB">
<!ENTITY tcl-url "https://downloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5 "aa0a121d95a0e7b73a036f26028538d4">
+<!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc">
<!ENTITY tcl-home "http://tcl.sourceforge.net/">
<!ENTITY tcl-ch5-du "71 MB">
<!ENTITY tcl-ch5-sbu "0.9 SBU">
@@ -713,12 +713,12 @@
<!ENTITY util-linux-ch6-du "283 MB">
<!ENTITY util-linux-ch6-sbu "1.2 SBU">
-<!ENTITY vim-version "8.1.1846">
+<!ENTITY vim-version "8.1.2361">
<!ENTITY vim-majmin "81">
<!ENTITY vim-docdir "vim/vim81">
-<!ENTITY vim-size "14,078 KB">
+<!ENTITY vim-size "14,267 KB">
<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
-<!ENTITY vim-md5 "4f129a05254d93c739fcede843df87df">
+<!ENTITY vim-md5 "7813b45901af53f81abeaf3c67ae9b34">
<!ENTITY vim-home "https://www.vim.org">
<!ENTITY vim-ch6-du "190 MB">
<!ENTITY vim-ch6-sbu "2.2 SBU">
diff --git a/patches.ent b/patches.ent
index eb734051e..190b80d1a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- Start of Common Patches -->
-<!--
+
<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
-<!ENTITY bash-fixes-patch-md5 "e3d5bf23a4e5628680893d46e6ff286e">
-<!ENTITY bash-fixes-patch-size "17 KB">
--->
+<!ENTITY bash-fixes-patch-md5 "c1545da2ad7d78574b52c465ec077ed9">
+<!ENTITY bash-fixes-patch-size "22 KB">
+
<!--
<!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
<!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">