From 12e721d3a5665277525bee8d50bc49a5bfd9ff8c Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Sat, 19 Oct 2019 17:40:04 +0000 Subject: MultiLib: Merge changes from trunk git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11687 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 6 +++--- bootscripts/ChangeLog | 4 ++++ bootscripts/lfs/init.d/mountfs | 2 +- bootscripts/lfs/init.d/network | 4 ++-- bootscripts/lfs/init.d/swap | 2 +- bootscripts/lfs/init.d/sysklogd | 2 +- chapter01/changelog.xml | 29 +++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 12 ++++++------ chapter05/glibc.xml | 9 ++++++++- chapter06/binutils.xml | 3 +-- chapter06/chapter06.xml | 4 ++-- chapter06/python.xml | 13 +++++++------ general.ent | 6 +++--- packages.ent | 36 ++++++++++++++++++------------------ 14 files changed, 86 insertions(+), 46 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 1ab3a7788..934d783bb 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1114,7 +1114,7 @@ &external; - GPL Ghostscript + Ghostscript @@ -2339,7 +2339,7 @@ &dependencies; - Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC, + Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC, Gettext, Glibc, Grep, Make, and Sed @@ -2364,7 +2364,7 @@ &external; - Acl, Attr, Cracklib, and PAM + Cracklib, and PAM diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 6017bb965..a54fd1a3d 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,7 @@ +2019-10-04 DJ Lucas + * Additional updates to facilities in LSB headers to keep proper order + * Network script depends on firewall scripts from BLFS if activated + 2019-09-02 DJ Lucas * Update facilities in LSB headers diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs index 4cb37c61f..185a0ab7a 100644 --- a/bootscripts/lfs/init.d/mountfs +++ b/bootscripts/lfs/init.d/mountfs @@ -16,7 +16,7 @@ # Provides: $local_fs # Required-Start: udev checkfs # Should-Start: modules -# Required-Stop: swap +# Required-Stop: localnet # Should-Stop: # Default-Start: S # Default-Stop: 0 6 diff --git a/bootscripts/lfs/init.d/network b/bootscripts/lfs/init.d/network index 46dd4b565..140bc72e8 100644 --- a/bootscripts/lfs/init.d/network +++ b/bootscripts/lfs/init.d/network @@ -17,9 +17,9 @@ ### BEGIN INIT INFO # Provides: $network # Required-Start: $local_fs $syslog localnet swap -# Should-Start: +# Should-Start: firewalld iptables nftables # Required-Stop: $local_fs $syslog localnet swap -# Should-Stop: +# Should-Stop: firewalld iptables nftables # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Short-Description: Starts and configures network interfaces. diff --git a/bootscripts/lfs/init.d/swap b/bootscripts/lfs/init.d/swap index 1198ee4c6..bbe1982d8 100644 --- a/bootscripts/lfs/init.d/swap +++ b/bootscripts/lfs/init.d/swap @@ -16,7 +16,7 @@ # Provides: swap # Required-Start: udev # Should-Start: modules -# Required-Stop: localnet +# Required-Stop: localnet $local_fs # Should-Stop: # Default-Start: S # Default-Stop: 0 6 diff --git a/bootscripts/lfs/init.d/sysklogd b/bootscripts/lfs/init.d/sysklogd index 8939e8a8a..7f0f153d9 100644 --- a/bootscripts/lfs/init.d/sysklogd +++ b/bootscripts/lfs/init.d/sysklogd @@ -17,7 +17,7 @@ # Required-Start: $first localnet # Should-Start: # Required-Stop: $local_fs -# Should-Stop: +# Should-Stop: sendsignals # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Starts kernel and system log daemons. diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index dfce502ee..556ed1d4b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,35 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2019-10-17 + + + [bdubbs] - Move attr and acl to be before shadow. + + + [bdubbs] - Update to linux-5.3.6. Fixes + #4534. + + + [bdubbs] - Update to man-pages-5.03. Fixes + #4536. + + + [bdubbs] - Update to meson-0.52.0. Fixes + #4535. + + + [bdubbs] - Update to Python-3.8.0. Fixes + #4538. + + + [bdubbs] - Update to binutils-2.33.1. Fixes + #4537. + + + + 2019-10-03 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 0f5ffafb5..4d7509b19 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -44,9 +44,9 @@ - + Bison-&bison-version; @@ -173,9 +173,9 @@ Man-DB-&man-db-version; - + Meson-&meson-version; @@ -209,9 +209,9 @@ - + diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 9ed9afa39..ed19f960d 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -51,12 +51,19 @@ cd build Next, prepare Glibc for compilation: -../configure \ +../configure \ --prefix=/tools \ --host=$LFS_TGT \ --build=$(../scripts/config.guess) \ --enable-kernel=&min-kernel; \ --with-headers=/tools/include +../configure \ + --prefix=/tools \ + --host=$LFS_TGT \ + --build=$(../scripts/config.guess) \ + --enable-kernel=&min-kernel; \ + --enable-multi-arch \ + --with-headers=/tools/include diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index 3d7f532e5..721590376 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -157,8 +157,7 @@ cd build make -k check - The PC-relative offset test and - the debug_msg.sh test may fail in the LFS environment. + The ver_test_pr16504.sh test is known to fail. Install the package: diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index c93a29f1d..a95753385 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -35,13 +35,13 @@ + + - - diff --git a/chapter06/python.xml b/chapter06/python.xml index b6e3c9f15..d29f664e9 100644 --- a/chapter06/python.xml +++ b/chapter06/python.xml @@ -89,15 +89,15 @@ Install the package: make install -chmod -v 755 /usr/lib/libpython&python-minor;m.so +chmod -v 755 /usr/lib/libpython&python-minor;.so chmod -v 755 /usr/lib/libpython3.so -ln -sfv pip3.7 /usr/bin/pip3 +ln -sfv pip&python-minor; /usr/bin/pip3 The meaning of the install commands: - + - chmod -v 755 /usr/lib/libpython3.{7m.,}so + chmod -v 755 /usr/lib/libpython3.{8.,}so Fix permissions for libraries to be consistent with other libraries. @@ -146,10 +146,11 @@ tar --strip-components=1 \ 2to3, idle3, pip3, pydoc3, python3, python3-config, and pyvenv - libpython&python-minor;m.so and libpython3.so + libpython&python-minor;.so and libpython3.so - /usr/include/python&python-minor;m, /usr/lib/python3 and + /usr/include/python&python-minor;, + /usr/lib/python3, and /usr/share/doc/python-&python-version; diff --git a/general.ent b/general.ent index 061a92e02..a78b13b5d 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index 8322c4612..45d69d506 100644 --- a/packages.ent +++ b/packages.ent @@ -58,10 +58,10 @@ - - + + - + @@ -430,12 +430,12 @@ - + - + - + - - - + + + - + - - + + -- cgit v1.2.3-54-g00ecf