diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2de9bcfe8..1c2214cc9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,32 @@
appropriate for the entry or if needed the entire day's listitem.
-->
+
+ 2019-04-20
+
+
+ [bdubbs] - Update to perl-5.28.2. Fixes
+ #4460.
+
+
+ [bdubbs] - Update to meson-0.50.1. Fixes
+ #4459.
+
+
+ [bdubbs] - Update to linux-5.0.9. Fixes
+ #4458.
+
+
+ [bdubbs] - Update to libcap-2.27. Fixes
+ #4457.
+
+
+ [renodr] - Fix the syntax used for configuring automatic file
+ creation and deletion.
+
+
+
+
2019-04-15
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 52f3c9f3c..55143555d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -146,9 +146,9 @@
-
+
@@ -197,9 +197,9 @@
-
+
diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml
index a7d124ecc..daaca2ec7 100644
--- a/chapter02/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -234,4 +234,23 @@ bash library-check.sh
or all absent, but not only one or two present.
-->
+
+ Building multilib support requires the kernel of the host system
+ to have 32-bit emulation support included.
+
+Binary Emulations --->
+ [*] IA32 Emulation
+ <M> IA32 a.out support
+ [*] x32 ABI for 64-bit mode
+
+ The option 'IA32 a.out support' is
+ optional. In case your kernel does not have 'x32 ABI for 64-bit mode'
+ enabled but only 'IA32 Emulation', you can continue to build your
+ system but you have to leave out any sections showing instructions
+ for building x32 objects. If neither 'IA32 Emulation' nor
+ 'x32 ABI for 64-bit mode' is enabled, you will run in errors
+ latest when building glibc in Chapter 6,
+ so an upgrade of your host system is required.
+
+
diff --git a/chapter06/glibc-32.xml b/chapter06/glibc-32.xml
index 227228fed..56e2e1314 100644
--- a/chapter06/glibc-32.xml
+++ b/chapter06/glibc-32.xml
@@ -19,32 +19,9 @@
Glibc-32
-
-
-
-
-
- Installation of Glibc - 32-bit
+
+ Preparation to install of ML-Glibc
patch -Np1 -i ../&glibc-fhs-patch;
@@ -52,6 +29,13 @@
mv /usr/include/limits.h{,.backup}
+
+
+
+
+
+ Installation of Glibc - 32-bit
+
The Glibc documentation recommends building Glibc
in a dedicated build directory:
@@ -60,8 +44,8 @@ cd build
Prepare Glibc for compilation:
-CC="gcc -m32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
-CXX="g++ -m32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
+CC="gcc -m32 -ffile-prefix-map=/tools=/usr" \
+CXX="g++ -m32 -ffile-prefix-map=/tools=/usr" \
../configure --prefix=/usr \
--disable-werror \
--enable-kernel=&min-kernel; \
@@ -101,6 +85,30 @@ rm -rf build
+
+
Glibc - x32-bit
@@ -113,8 +121,8 @@ cd build
Prepare Glibc for compilation:
-CC="gcc -mx32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
-CXX="g++ -mx32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
+CC="gcc -mx32 -ffile-prefix-map=/tools=/usr" \
+CXX="g++ -mx32 -ffile-prefix-map=/tools=/usr" \
../configure --prefix=/usr \
--disable-werror \
--enable-kernel=&min-kernel; \
@@ -153,11 +161,17 @@ ldconfig
cd ..
rm -rf build
+
+
+
+
+
+ Cleanup
+
Restore the file we moved temporarily away:
mv /usr/include/limits.h{.backup,}
-
+
-
diff --git a/chapter07/systemd-custom.xml b/chapter07/systemd-custom.xml
index 4cea2b27d..7849c7816 100644
--- a/chapter07/systemd-custom.xml
+++ b/chapter07/systemd-custom.xml
@@ -112,8 +112,8 @@ EOF
be copied to /etc/tmpfiles.d
and edited as desired. For example:
-mkdir -p /etc/tempfiles.d
-cp /usr/lib/tmpfiles.d/tmp.conf /etc/tempfiles.d
+mkdir -p /etc/tmpfiles.d
+cp /usr/lib/tmpfiles.d/tmp.conf /etc/tmpfiles.d
diff --git a/general.ent b/general.ent
index 95421d613..967c920c9 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-
+
-
+
-
+
diff --git a/packages.ent b/packages.ent
index 43d3fea47..d3a101217 100644
--- a/packages.ent
+++ b/packages.ent
@@ -397,10 +397,10 @@
-
-
+
+
-
+
@@ -431,12 +431,12 @@
-
+
-
+
-
+