From f77b95fb3fbd54a9f007f00c86b6cda25f8f373c Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Wed, 19 Aug 2015 20:20:02 +0000 Subject: [PATCH] Update to binutils-2.25.1 Update to check-0.10.0 Update to procps-ng-3.3.11 Update to man-pages-4.02 Update to glibc-2.22 Update to linux-4.1.5 Update to tzdata2015f XML Cleanups Add a workaround for ncurses in Chapter 5 to not use mawk if found Document some test suite failures git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10940 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 31 +++++++++++++++ chapter01/whatsnew.xml | 23 +++++------ chapter03/patches.xml | 86 ++--------------------------------------- chapter05/glibc.xml | 31 --------------- chapter05/ncurses.xml | 5 +-- chapter06/autoconf.xml | 2 +- chapter06/glibc.xml | 33 ++++++---------- chapter06/inetutils.xml | 3 ++ chapter06/ncurses.xml | 9 +---- chapter06/procps.xml | 5 +-- general.ent | 4 +- packages.ent | 48 +++++++++++------------ patches.ent | 2 + 13 files changed, 94 insertions(+), 188 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ffc42dbe7..f764ee67c 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,37 @@ --> + + 2015-08-19 + + + [bdubbs] - Add a workaround to ncurses in + Chapter 5 for hosts that have mawk installed. + + + [renodr] - Update to binutils-2.25.1. + + + [renodr] - Update to check-0.10.0. + + + [renodr] - Update to procps-ng-3.3.11. + + + [renodr] - Update to man-pages-4.02. + + + [renodr] - Update to glibc-2.22. + + + [renodr] - Update to linux-4.1.5. + + + [renodr] - Update to tzdata2015f. + + + + 2015-07-23 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 7ed750be0..e7bd21459 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -40,18 +40,18 @@ - + - + Coreutils &coreutils-version; @@ -94,9 +94,9 @@ Gettext &gettext-version; - + @@ -166,9 +166,9 @@ MPFR &mpfr-version; - + Patch &patch-version; @@ -178,9 +178,9 @@ - + @@ -246,9 +246,6 @@ &gcc-upstream-patch; --> - - &ncurses-gcc5-buildfixes-patch; - &systemd-compat-patch; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index a8d6f5389..57f21aeae 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -33,31 +33,6 @@ MD5 sum: &bc-memory-leak-patch-md5; - Bzip2 Documentation Patch - &bzip2-docs-patch-size;: @@ -73,34 +48,7 @@ MD5 sum: &coreutils-i18n-patch-md5; - - - Glibc FHS Patch - &glibc-fhs-patch-size;: @@ -116,31 +64,14 @@ MD5 sum: &kbd-backspace-patch-md5; - - - Ncurses GCC 5 Fixes Patch - &ncurses-gcc5-buildfixes-patch-size;: + + + --> + Readline Upstream Fixes Patch - &readline-fixes-patch-size;: @@ -156,15 +87,6 @@ MD5 sum: &systemd-compat-patch-md5; - Total size of these patches: about diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 9916b4fb2..ecbefa16a 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -43,42 +43,11 @@ Installation of Glibc - - Fix a regression in the package that affects 32-bit architectures: - -sed -e '/ia32/s/^/1:/' \ - -e '/SSE2/s/^1://' \ - -i sysdeps/i386/i686/multiarch/mempcpy_chk.S - The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: mkdir -v ../glibc-build cd ../glibc-build - Next, prepare Glibc for compilation: diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml index 336172b59..26ef70464 100644 --- a/chapter05/ncurses.xml +++ b/chapter05/ncurses.xml @@ -43,10 +43,9 @@ Installation of Ncurses - First, apply a patch to prevent a build failure - when building with GCC 5: + First, ensure that gawk is found first during configuration: -patch -Np1 -i ../&ncurses-gcc5-buildfixes-patch; +sed -i s/mawk// configure Prepare Ncurses for compilation: diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml index 12166a8ea..ddad6087b 100644 --- a/chapter06/autoconf.xml +++ b/chapter06/autoconf.xml @@ -55,7 +55,7 @@ This takes a long time, about 4.7 SBUs. In addition, 6 tests are skipped that use Automake. For full test coverage, Autoconf can be re-tested - after Automake has been installed. In addition, one test fails due to + after Automake has been installed. In addition, two tests fail due to changes in libtool-2.4.3 and later. Install the package: diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 6663d3ea1..f1c1a68d1 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -53,14 +53,12 @@ an iconv() implementation and can convert from/to Unicode, therefore libiconv is not required on an LFS system. - Some of the Glibc programs use non-FHS compilant /var/db directory to store their runtime data. Apply the following patch to make such programs store their runtime data in the FHS-compliant locations: - -patch -Np1 -i ../&glibc-fhs-patch; - + +patch -Np1 -i ../&glibc-fhs-patch; The Glibc build system is self-contained and will install perfectly, even though the compiler specs file and linker are still pointing at /tools. The specs @@ -68,22 +66,6 @@ Glibc autoconf tests would give false results and defeat the goal of achieving a clean build. - Fix a regression in the package that affects 32-bit architectures: - -sed -e '/ia32/s/^/1:/' \ - -e '/SSE2/s/^1://' \ - -i sysdeps/i386/i686/multiarch/mempcpy_chk.S - - Fix a potential security issue identified upstream: - -sed -i '/glibc.*pad/{i\ buflen = buflen > pad ? buflen - pad : 0; - s/ + pad//}' resolv/nss_dns/dns-host.c - - Fix a test case that fails when built using GCC 5: - -sed -e '/tst-audit2-ENV/i CFLAGS-tst-audit2.c += -fno-builtin' \ - -i elf/Makefile - The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: @@ -119,8 +101,9 @@ cd ../glibc-build - posix/tst-getaddrinfo4 will always fail - due to not having a network connection when the tests are run. + posix/tst-getaddrinfo4 will always fail + due to not having the necessary network applications when the tests are + run. @@ -150,6 +133,12 @@ cd ../glibc-build that has not yet been generated. --> + + The elf/tst-protected1a and + elf/tst-protected1a tests are known to + fail with the current stable version of binutils. + + Other tests known to fail on some architectures are malloc/tst-malloc-usable and nptl/tst-cleanupx4. diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index 464862a87..84fffedca 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -95,6 +95,9 @@ To test the results, issue: make check + One test, libls.sh, is known to fail due to hard + coding of some support program paths. All tests pass if the tests are rerun + at the end of Chapter 6. Install the package: diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index c82bfa5e0..f84948146 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -41,11 +41,6 @@ Installation of Ncurses - First, apply a patch to prevent a build failure - when building with GCC 5: - -patch -Np1 -i ../&ncurses-gcc5-buildfixes-patch; - Don't install a static library that is not handled by configure: sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in @@ -113,7 +108,7 @@ /lib directory, where they are expected to reside: -mv -v /usr/lib/libncursesw.so.5* /lib +mv -v /usr/lib/libncursesw.so.6* /lib Because the libraries have been moved, one symlink points to a non-existent file. Recreate it: @@ -157,7 +152,7 @@ cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version; --without-debug \ --without-cxx-binding make sources libs -cp -av lib/lib*.so.5* /usr/lib +cp -av lib/lib*.so.6* /usr/lib diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 7baf9d7cc..71c0e0b04 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -76,11 +76,10 @@ make check make install -Finally, move essential files to a location that can be found if +Finally, move essential libraries to a location that can be found if /usr is not mounted. -mv -v /usr/bin/pidof /bin -mv -v /usr/lib/libprocps.so.* /lib +mv -v /usr/lib/libprocps.so.* /lib ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so diff --git a/general.ent b/general.ent index 2f0230b8a..d2ecb7df0 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - + - + diff --git a/packages.ent b/packages.ent index bcd9d1ce2..a47a0f301 100644 --- a/packages.ent +++ b/packages.ent @@ -57,10 +57,10 @@ - - + + - + @@ -87,10 +87,10 @@ - - + + - + @@ -230,10 +230,10 @@ - - + + - + @@ -375,12 +375,12 @@ - + - + - + +