From 12836f58d2db3fc47b91c4b544daa9f17b25c56c Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sat, 6 Aug 2016 03:53:06 +0000 Subject: [PATCH] Update to grub-2.02~beta3. Update to glibc-2.24. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11100 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 14 ++++++++++++++ chapter01/whatsnew.xml | 11 +++++------ chapter03/patches.xml | 12 ++++++------ chapter05/glibc.xml | 4 ---- chapter06/gcc.xml | 4 ++++ chapter06/glibc.xml | 20 ++------------------ chapter06/sysklogd.xml | 8 +++++--- general.ent | 6 +++--- packages.ent | 12 ++++++------ patches.ent | 4 ++++ 10 files changed, 49 insertions(+), 46 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 93faf2e4f..5967e8309 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -42,6 +42,20 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2016-08-05 + + + [bdubbs] - Update to grub-2.02~beta3. Fixes + #3897. + + + [bdubbs] - Update to glibc-2.24. Fixes + #3963. + + + + 2016-07-29 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index a7ebafb9b..a93c7820f 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -98,9 +98,9 @@ Gettext &gettext-version; - + GMP &gmp-version; @@ -113,9 +113,9 @@ - + Gzip &gzip-version; @@ -252,9 +252,8 @@ - &glibc-upstream-patch; + gcc-6.1.0-asan-1.patch - diff --git a/chapter03/patches.xml b/chapter03/patches.xml index efd6ce94a..6e9746cd2 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -51,18 +51,18 @@ - Glibc FHS Patch - &glibc-fhs-patch-size;: + Gccc ASAN Patch - &gcc-asan-patch-size;: - Download: - MD5 sum: &glibc-fhs-patch-md5; + Download: + MD5 sum: &gcc-asan-patch-md5; - Glibc Upstream Patch - &glibc-upstream-patch-size;: + Glibc FHS Patch - &glibc-fhs-patch-size;: - Download: - MD5 sum: &glibc-upstream-patch-md5; + Download: + MD5 sum: &glibc-fhs-patch-md5; diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 2a72325c9..e9832c651 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -43,10 +43,6 @@ Installation of Glibc - Fix some problems identified upstream: - -patch -Np1 -i ../&glibc-upstream-patch; - The Glibc documentation recommends building Glibc in a dedicated build directory: diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index f89a810a9..e7b735914 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -41,6 +41,10 @@ Installation of GCC + First fix a problem identified upstream: + +patch -Np1 -i ../gcc-6.1.0-asan-1.patch + The GCC documentation recommends building GCC in a dedicated build directory: mkdir -v build diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 02abb3dad..61a2374ef 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -42,18 +42,7 @@ Installation of Glibc - + The Glibc build system is self-contained and will install perfectly, even though the compiler specs file and linker are still pointing to /tools. The specs @@ -68,10 +57,6 @@ patch -Np1 -i ../&glibc-fhs-patch; - Fix some problems identified upstream: - -patch -Np1 -i ../&glibc-upstream-patch; - The Glibc documentation recommends building Glibc in a dedicated build directory: @@ -105,8 +90,7 @@ cd build - posix/tst-getaddrinfo4 and - posix/tst-getaddrinfo5 will always fail due + posix/tst-getaddrinfo4 will always fail due to not having the necessary networking applications when the tests are run. diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index d4cf68ecb..f2f25a9a2 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -41,10 +41,12 @@ Installation of Sysklogd - First, fix a problem that causes a segmentation fault under - some conditions in klogd: + First, fix problems that causes a segmentation fault under + some conditions in klogd and fix an obsolete program construct: -sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c +sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c +sed -i 's/union wait/int*/' syslogd.c + Compile the package: diff --git a/general.ent b/general.ent index 8714d6d42..c7ccbf975 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index f59da2829..aa79f2d94 100644 --- a/packages.ent +++ b/packages.ent @@ -238,10 +238,10 @@ - - + + - + @@ -283,10 +283,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index b1a2bd971..f8eb8b2cf 100644 --- a/patches.ent +++ b/patches.ent @@ -18,6 +18,10 @@ + + + +