diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e0a55f6e9..260d86b97 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
2012-12-28
+
+ [matthew] - Upgrade to Glibc-2.17. Fixes
+ #3261.
+
[matthew] - Upgrade to Sed-4.2.2. Fixes
#3260.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 5a870fd01..904a14608 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -85,9 +85,9 @@
-
+
GMP &gmp-version;
@@ -236,10 +236,6 @@
&gcc-startfiles-patch;
-
- &glibc-installation-patch;
-
-
&make-fixes-patch;
@@ -261,6 +257,14 @@
gcc-4.7.1-startfiles_fix-1.patch
+
+ glibc-2.16.0-fix_test_installation-1.patch
+
+
+
+ glibc-2.16.0-res_query_fix-1.patch
+
+
kmod-9-testsuite-1.patch
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 09ab963c9..caf126c10 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -50,22 +50,6 @@
-
- Glibc DNS Resolve Patch - &glibc-fix-resolv-patch-size;:
-
- Download:
- MD5 sum: &glibc-fix-resolv-patch-md5;
-
-
-
-
- Glibc test-installation.pl Patch - &glibc-installation-patch-size;:
-
- Download:
- MD5 sum: &glibc-installation-patch-md5;
-
-
-
Kbd Loadkeys Fix Patch - &kbd-fixes-patch-size;:
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index e3edf9630..9af9bafd8 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -52,10 +52,6 @@
su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc'
fi
- Fix an issue when building Glibc-&glibc-version; with GCC-&gcc-version;:
-
-sed -i 's/ -lgcc_s//' Makeconfig
-
The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 3431ae5d4..80bd4cf60 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -61,67 +61,12 @@
Glibc autoconf tests would give false results and defeat the goal
of achieving a clean build.
-
-
- Fix a problem that causes the build to fail in the LFS environment:
-
-sed -i 's#<rpc/types.h>#"rpc/types.h"#' sunrpc/rpc_clntout.c
-
-
-
- When running make install, a script called
- test-installation.pl performs a small sanity test on
- our newly installed Glibc. Use a patch to fix the bug that causes it to
- fail:
-
-patch -Np1 -i ../&glibc-installation-patch;
-
- The ldd shell script contains Bash-specific
- syntax. Change its default program interpreter to /bin/bash
- in case another /bin/sh is installed as described in the
- Shells
- chapter of the BLFS book:
-
-sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
-
- Now fix a problem that causes some applications to crash when
- utilizing problem nameservers:
-
-patch -Np1 -i ../&glibc-fix-resolv-patch;
-
The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:
mkdir -v ../glibc-build
cd ../glibc-build
-
Prepare Glibc for compilation:
../glibc-&glibc-version;/configure \
@@ -157,8 +102,6 @@ esac
Generally a few tests do not pass, but you can generally ignore
any of the test failures listed below. Now test the build results:
-
-
make -k check 2>&1 | tee glibc-check-log
grep Error glibc-check-log
@@ -169,12 +112,6 @@ grep Error glibc-check-log
most common issues:
-
-
-
The nptl/tst-clock2,
@@ -192,15 +129,6 @@ grep Error glibc-check-log
authentic AMD processor.
-
-
When running on older and slower hardware or on systems under
load, some tests can fail because of test timeouts being exceeded.
@@ -287,8 +215,6 @@ localedef -i zh_CN -f GB18030 zh_CN.GB18030
install locales not listed in the
glibc-&glibc-version;/localedata/SUPPORTED file
in the unlikely case you need them.
-
diff --git a/packages.ent b/packages.ent
index ab4a19673..daedf5418 100644
--- a/packages.ent
+++ b/packages.ent
@@ -198,10 +198,10 @@
-
-
+
+
-
+
@@ -540,10 +540,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index 012a29e1e..07f87359c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -29,14 +29,6 @@
-
-
-
-
-
-
-
-