diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 8d6883cb0..7f14ee784 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1040,7 +1040,7 @@
&external;
- Pcre, Xorg, and CUPS
+ Pcre
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5a7853603..70220637c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,24 @@
-->
+
+ 2016-02-06
+
+
+ [dj] - Updated to grep-2.23 - Merged from trunk.
+
+
+ [dj] - Updated to linux-4.1.1 - Merged from trunk.
+
+
+ [dj] - Updated to binutils-2.26 - Merged from trunk.
+
+
+ [dj] - Updated to tzdata-2016a - Merged from trunk.
+
+
+
+
2016-02-01
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0a6b0de2a..041a33293 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -40,9 +40,9 @@
-
+
@@ -100,9 +100,9 @@
GMP &gmp-version;
-
+
Grep &grep-version;
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index c05a7970e..0549579a1 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -33,6 +33,14 @@
MD5 sum: &bc-memory-leak-patch-md5;
+
+ Binutils Upstream Patch - &binutils-upstream-patch-size;:
+
+ Download:
+ MD5 sum: &binutils-upstream-patch-md5;
+
+
+
Bzip2 Documentation Patch - &bzip2-docs-patch-size;:
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index 07c155cc2..0ea4f92ef 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -16,13 +16,13 @@
First, backup the /tools linker,
and replace it with the adjusted linker we made in chapter 5. We'll also create
- a link to its counterpart in /tools/$(gcc
- -dumpmachine)/bin:
+ a link to its counterpart in
+ /tools/$(uname -m)-pc-linux-gnu/bin:
mv -v /tools/bin/{ld,ld-old}
-mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old}
+mv -v /tools/$(uname -m)-pc-linux-gnu/bin/{ld,ld-old}
mv -v /tools/bin/{ld-new,ld}
-ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld
+ln -sv /tools/bin/ld /tools/$(uname -m)-pc-linux-gnu/bin/ld
Next, amend the GCC specs file so that it points to the new
dynamic linker. Simply deleting all instances of /tools
should
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index fb9dc4b31..a33c6cf60 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -56,15 +56,11 @@
The system has no more ptys.
Ask your system administrator to create more.
-
The Binutils documentation recommends building Binutils
in a dedicated build directory:
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 94d8204db..58b0db366 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -52,8 +52,6 @@
make check
- The test-update-copyright.sh failure can be safely ignored.
-
Install the package:
make install
diff --git a/general.ent b/general.ent
index 0c3afae46..fbab1bd29 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
+
-
+
diff --git a/packages.ent b/packages.ent
index 3ca44408e..bccc5ba11 100644
--- a/packages.ent
+++ b/packages.ent
@@ -57,10 +57,10 @@
-
-
+
+
-
+
@@ -257,10 +257,10 @@
-
-
+
+
-
+
@@ -375,12 +375,12 @@
-
-
-
-
+
+
+
+
-
+