diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 73e81216c..ac0aa8d8b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,40 @@
appropriate for the entry or if needed the entire day's listitem.
-->
+
+ 2018-09-20
+
+
+ [bdubbs] - Clean up of unneeded symbolic links.
+ Reordered packages so version specific packages are
+ built as late as possible in Chapter 6. Now building
+ util-linux in Chapter 5 is unneeded and has been removed.
+ Fixes #4345 and
+ #4349.
+
+
+ [bdubbs] - Update to eudev-3.2.6. Fixes
+ #4350.
+
+
+ [bdubbs] - Update to elfutils-0.174 (libelf). Fixes
+ #4348.
+
+
+ [bdubbs] - Update to psmisc-23.2. Fixes
+ #4347.
+
+
+ [bdubbs] - Update to openssl-1.1.1. Fixes
+ #4346.
+
+
+ [bdubbs] - Update to linux-4.18.9. Fixes
+ #4344.
+
+
+
+
2018-09-02
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 44d68ccd9..9b33722de 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -68,9 +68,9 @@
-
+
E2fsprogs-&e2fsprogs-version;
@@ -149,18 +149,18 @@
-
+
+ Libelf-&elfutils-version; (from elfutils)
+
-
+
@@ -185,9 +185,9 @@
-
+
@@ -200,9 +200,9 @@
-
+
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 7b215ba49..1951fde7e 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -24,7 +24,6 @@
-
@@ -44,7 +43,7 @@
-
+
diff --git a/chapter05/make.xml b/chapter05/make.xml
index ec2a6e8d4..1ccc60ece 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -42,7 +42,7 @@
Installation of Make
- First, work around an error caused by glibc-2.27:
+ First, work around an error caused by glibc-2.27 and later:
sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index cd152491d..79212653c 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -39,7 +39,6 @@
-
@@ -65,12 +64,6 @@
-
-
-
-
-
-
@@ -85,20 +78,24 @@
+
+
+
+
+
+
+
+
+
-
-
-
-
-
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index cd90477df..0f7b7e0ac 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -39,40 +39,27 @@
will be replaced by real files throughout the course of this chapter after the
software has been installed:
-
-
-
-
ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
-ln -sv /tools/bin/{env,install,perl} /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-for lib in blkid lzma mount uuid
+ln -sv /tools/bin/{env,install,perl} /usr/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
+
+install -vdm755 /usr/lib/pkgconfig
+
+ln -sv bash /bin/sh
+
+
+
+
+done-->
The purpose of each link:
@@ -107,6 +94,14 @@ ln -sv bash /bin/sh
+
+ /usr/bin/env
+
+ This pathname is hard-coded into some packages build procedures.
+
+
+
+
/usr/bin/install
@@ -182,14 +177,14 @@ ln -sv bash /bin/sh
-->
-
+ utilities from acquiring an
+ These links prevent utilities from acquiring an
unnecessary reference to the
/tools directory.
-
+ -->
/bin/sh
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 6b935a265..76bb1db15 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -117,13 +117,17 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
Compile the package:
make
-
+
-ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib
-make LD_LIBRARY_PATH=/tools/lib check
+ To run the tests, issue:
+
+make check
+
+
One of the E2fsprogs tests will attempt to allocate 256 MB of memory.
If you do not have significantly more RAM than this, be sure to enable
diff --git a/chapter06/libelf.xml b/chapter06/libelf.xml
index 7166dd48f..280d1fe66 100644
--- a/chapter06/libelf.xml
+++ b/chapter06/libelf.xml
@@ -14,7 +14,7 @@
&elfutils-url;
- Libelf &elfutils-version;
+ Libelf from Elfutils-&elfutils-version;
Libelf
diff --git a/chapter06/make.xml b/chapter06/make.xml
index bf57ce74c..e2792976b 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,7 +40,7 @@
Installation of Make
- Again, work around an error caused by glibc-2.27:
+ Again, work around an error caused by glibc-2.27 and later:
sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c
Prepare Make for compilation:
diff --git a/general.ent b/general.ent
index 76d72f81e..293f0639f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-
+
-
+
-
+
diff --git a/packages.ent b/packages.ent
index 8d6cb6f7d..2ea26a333 100644
--- a/packages.ent
+++ b/packages.ent
@@ -142,18 +142,18 @@
-
-
+
+
-
+
-
-
+
+
-
+
@@ -413,12 +413,12 @@
-
+
-
+
-
+
+