From ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 4 Aug 2020 20:14:32 +0000 Subject: [PATCH] Update to gettext-0.21. Update to binutils-2.35. Update to gcc-10.2.0. Update to check-0.15.1. Update to bison-3.7.1. Update to util-linux 2.36.0. Update to libcap-2.42. Update to linux-5.7.12. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12007 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- bootscripts/ChangeLog | 3 ++ bootscripts/lfs/init.d/checkfs | 2 +- chapter01/changelog.xml | 38 +++++++++++++++++++++++++ chapter01/whatsnew.xml | 4 +-- chapter03/patches.xml | 16 ++++++++--- chapter04/creatingminlayout.xml | 6 ++-- chapter06/gcc-pass2.xml | 4 +-- chapter07/chapter07.xml | 2 +- chapter07/creatingdirs.xml | 8 ++++-- chapter08/binutils.xml | 6 ++-- chapter08/libcap.xml | 2 +- chapter08/libpipeline.xml | 4 +++ chapter08/pkgmgt.xml | 4 +-- chapter08/procps.xml | 6 +++- general.ent | 6 ++-- packages.ent | 50 ++++++++++++++++----------------- patches.ent | 10 +++++-- 17 files changed, 118 insertions(+), 53 deletions(-) diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 28a812d2c..240f1281e 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,6 @@ +2020-08-02 Bruce Dubbs + * Fix a minor display problem in checkfs + 2019-10-31 DJ Lucas * Syslog should not start in runlevel 2 due to network logging * Remove errant swap dependency for checkfs diff --git a/bootscripts/lfs/init.d/checkfs b/bootscripts/lfs/init.d/checkfs index c6827b363..2ca032033 100644 --- a/bootscripts/lfs/init.d/checkfs +++ b/bootscripts/lfs/init.d/checkfs @@ -94,7 +94,7 @@ case "${1}" in if [ "${error_value}" = 1 ]; then msg="\nWARNING:\n\nFile system errors " msg="${msg}were found and have been corrected.\n" - msg="${msg} You may want to double-check that " + msg="${msg} You may want to double-check that " msg="${msg}everything was fixed properly." log_warning_msg "$msg" fi diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ca3b9a934..aaac7c3fe 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -42,6 +42,44 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + + 2020-08-04 + + [bdubbs] - Update to gettext-0.21. Fixes + #4704. + + + [bdubbs] - Update to binutils-2.35. Fixes + #4702. + + + [bdubbs] - Update to gcc-10.2.0. Fixes + #4701. + + + [bdubbs] - Update to check-0.15.1. Fixes + #4700. + + + [bdubbs] - Update to bison-3.7.1. Fixes + #4699. + + + [bdubbs] - Update to util-linux 2.36.0. Fixes + #4698. + + + [bdubbs] - Update to libcap-2.42. Fixes + #4703. + + + [bdubbs] - Update to linux-5.7.12. Fixes + #4697. + + + + 2020-07-21 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index dcbe28312..0d205e1b6 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -48,9 +48,9 @@ Bc &bc-version; - + Bison-&bison-version; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index c3dda33cf..f2379fe3f 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -26,7 +26,7 @@ - + Bzip2 Documentation Patch - &bzip2-docs-patch-size;: @@ -58,7 +58,7 @@ MD5 sum: &glibc-fhs-patch-md5; - + Kbd Backspace/Delete Fix Patch - &kbd-backspace-patch-size;: @@ -75,6 +75,14 @@ + + Libpipeline Checks Patch - &libpipeline-checks-patch-size;: + + Download: + MD5 sum: &libpipeline-checks-patch-md5; + + + Sysvinit Consolidated Patch - &sysvinit-consolidated-patch-size;: diff --git a/chapter04/creatingminlayout.xml b/chapter04/creatingminlayout.xml index 731d21c54..b0f9260d5 100644 --- a/chapter04/creatingminlayout.xml +++ b/chapter04/creatingminlayout.xml @@ -8,9 +8,9 @@ - Creating the Minimal directory layout in LFS filesystem + Creating a limited directory layout in LFS filesystem - The first task performed in the LFS partition is to create a minimal + The first task performed in the LFS partition is to create a limited directory hierarchy so that programs compiled in may be installed in their final location. This is needed so that those temporary programs be overwritten @@ -19,7 +19,7 @@ Create the required directory layout by running the following as root: -mkdir -pv $LFS/{usr,lib,var,etc,bin,sbin} +mkdir -pv $LFS/{bin,etc,lib,sbin,usr,var} case $(uname -m) in x86_64) mkdir -pv $LFS/lib64 ;; esac diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml index 57aeee18b..592828a9c 100644 --- a/chapter06/gcc-pass2.xml +++ b/chapter06/gcc-pass2.xml @@ -62,12 +62,12 @@ mv -v mpc-&mpc-version; mpc sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64 ;; esac - + Create a separate build directory again: mkdir -v build diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml index aba235220..6ffd96471 100644 --- a/chapter07/chapter07.xml +++ b/chapter07/chapter07.xml @@ -18,8 +18,8 @@ - + diff --git a/chapter07/creatingdirs.xml b/chapter07/creatingdirs.xml index f8e2d3d0b..28ef34a3f 100644 --- a/chapter07/creatingdirs.xml +++ b/chapter07/creatingdirs.xml @@ -15,6 +15,10 @@ Create some root-level directories that are not in the limited set required in the previous chapters by issuing the following command: + Some of the directories below have already been created earlier + with explicit instructions or when installing some packages. They are + repeated below for completeness. + mkdir -pv /{boot,home,mnt,opt,srv} Create the required set of subdirectories below the root-level by @@ -30,8 +34,8 @@ mkdir -pv /usr/{,local/}share/man/man{1..8} mkdir -pv /var/{cache,local,log,mail,opt,spool} mkdir -pv /var/lib/{color,misc,locate} -ln -sv /run /var/run -ln -sv /run/lock /var/lock +ln -sfv /run /var/run +ln -sfv /run/lock /var/lock install -dv -m 0750 /root install -dv -m 1777 /tmp /var/tmp diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index aa1ca1a3a..3930090d0 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -58,11 +58,9 @@ Ask your system administrator to create more. Now remove one test that prevents the tests from running - to completion, and fix other tests in the gold test suite, which - need to be adjusted for GCC 10: + to completion: -sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in -patch -Np1 -i ../binutils-&binutils-version;-gcc10_gold_test_fix-1.patch +sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in The Binutils documentation recommends building Binutils in a dedicated build directory: diff --git a/chapter08/libcap.xml b/chapter08/libcap.xml index c2c59831c..d9ae8674f 100644 --- a/chapter08/libcap.xml +++ b/chapter08/libcap.xml @@ -45,7 +45,7 @@ Prevent a static library from being installed: -sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile +sed -i '/install -m.*STACAPLIBNAME/d' libcap/Makefile Compile the package: diff --git a/chapter08/libpipeline.xml b/chapter08/libpipeline.xml index 5d275d381..9dfc2949a 100644 --- a/chapter08/libpipeline.xml +++ b/chapter08/libpipeline.xml @@ -41,6 +41,10 @@ Installation of Libpipeline + First, fix the files in the test suite: + +patch -Np1 -i ../&libpipeline-checks-patch; + Prepare Libpipeline for compilation: ./configure --prefix=/usr diff --git a/chapter08/pkgmgt.xml b/chapter08/pkgmgt.xml index 14e94fdaf..e898416d8 100644 --- a/chapter08/pkgmgt.xml +++ b/chapter08/pkgmgt.xml @@ -38,7 +38,7 @@ There are some hints written on the topic of package management. Visit - the Hints Project and see if one of them + the Hints Project and see if one of them fits your need. @@ -231,7 +231,7 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install User Based Management This scheme, unique to LFS, was devised by Matthias Benkmann, and is - available from the Hints Project. In + available from the Hints Project. In this scheme, each package is installed as a separate user into the standard locations. Files belonging to a package are easily identified by checking the user ID. The features and shortcomings of this approach are diff --git a/chapter08/procps.xml b/chapter08/procps.xml index b09f0f69d..90648638c 100644 --- a/chapter08/procps.xml +++ b/chapter08/procps.xml @@ -72,7 +72,7 @@ Compile the package: make - + + To run the test suite, run: + +make check Install the package: diff --git a/general.ent b/general.ent index 9e8bea125..9dfa14730 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index a63ab05bb..a400fc81d 100644 --- a/packages.ent +++ b/packages.ent @@ -65,10 +65,10 @@ - - + + - + @@ -77,10 +77,10 @@ - - + + - + @@ -95,10 +95,10 @@ - + - + @@ -217,10 +217,10 @@ - - + + - + @@ -246,10 +246,10 @@ - - + + - + @@ -375,7 +375,7 @@ - + @@ -383,10 +383,10 @@ - - + + - + @@ -417,12 +417,12 @@ - + - + - + - + + + - + diff --git a/patches.ent b/patches.ent index f07cb22c0..3b4222780 100644 --- a/patches.ent +++ b/patches.ent @@ -6,9 +6,11 @@ + @@ -23,11 +25,11 @@ --> - + @@ -41,6 +43,10 @@ + + + +