diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4208da681..3ada283fa 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,34 @@
or as
appropriate for the entry or if needed the entire day's listitem.
-->
+
+ 2017-04-25
+
+
+ [bdubbs] - Update to vim-8.0.586. Fixes
+ #4078.
+
+
+ [bdubbs] - Update to eudev-3.2.2. Fixes
+ #4077.
+
+
+ [bdubbs] - Update to linux-4.10.12. Fixes
+ #4075.
+
+
+ [bdubbs] - Update to gperf-3.1. Fixes
+ #4053.
+
+
+ [bdubbs] - Improve instructions to save debugging
+ information for selected libraries when stripping at
+ the end of Chapter 6. Fixes
+ #4076 (again).
+
+
+
+
2017-04-22
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 42da0a7e8..a85296145 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -68,9 +68,9 @@
-
+
@@ -107,9 +107,9 @@
-
+
@@ -227,9 +227,9 @@
Util-Linux &util-linux-version;
-
+
diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml
index fcd0c2a49..a90f477ec 100644
--- a/chapter06/strippingagain.xml
+++ b/chapter06/strippingagain.xml
@@ -10,7 +10,8 @@
Stripping Again
- If the intended user is not a programmer and does not plan to do
+ This section is optional. If the intended user is not a
+ programmer and does not plan to do
any debugging on the system software, the system size can be decreased
by about 90 MB by removing the debugging symbols from binaries and
libraries. This causes no inconvenience other than not being able to
@@ -22,20 +23,38 @@
strip command, it is a good idea to make a
backup of the LFS system in its current state.
- First back up some libraries whose debug symbols are needed when
- running regression tests in BLFS packages:
+ First place the debugging sysmbols for selected libraries
+ in separate files. This debugging information is needed if running
+ regression tests that use valgrind or gdb later in BLFS.
+
-save_libs="ld- libatomic libc- libcilkrts libitm libmpx libpthread"
-save_libs="$save_libs libquadmath libsanitizer libstdc++ libthread_db libvtv"
-mkdir -p /var/dbg/lib /var/dbg/usr/lib
+save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"
-for lib in $save_libs
-do
- find /usr/lib -name ${lib}*so* -type f -exec cp {} /var/dbg/usr/lib \;
- find /lib -name ${lib}*so* -type f -exec cp {} /var/dbg/lib \;
-done
+cd /lib
+
+for LIB in $save_lib; do
+ objcopy --only-keep-debug $LIB $LIB.dbg
+ strip --strip-unneeded $LIB
+ objcopy --add-gnu-debuglink=$LIB.dbg $LIB
+done
+
+save_usrlib="libquadmath.o.0.0.0 libstdc++.so.6.0.22
+ libmpx.so.2.0.0 libmpxwrappers.so.2.0.0 libitm.so.1.0.0
+ libcilkrts.so.5.0.0 libatomic.so.1.2.0"
+
+cd /usr/lib
+
+for LIB in $save_usrlib; do
+ objcopy --only-keep-debug $LIB $LIB.dbg
+ strip --strip-unneeded $LIB
+ objcopy --add-gnu-debuglink=$LIB.dbg $LIB
+done
+
+unset LIB save_lib save_usrlib
Before performing the stripping, take special care to ensure that
none of the binaries that are about to be stripped are running. If
@@ -57,7 +76,7 @@ done
/tools/bin/find /usr/lib -type f -name \*.a \
-exec /tools/bin/strip --strip-debug {} ';'
-/tools/bin/find /lib /usr/lib -type f -name \*.so* \
+/tools/bin/find /lib /usr/lib -type f \(-name \*.so* -a ! -name \*dbg\) \
-exec /tools/bin/strip --strip-unneeded {} ';'
/tools/bin/find /{bin,sbin} /usr/{bin,sbin,libexec} -type f \
@@ -68,13 +87,4 @@ done
warnings indicate that those files are scripts instead of
binaries.
- If desired, restore the saved libraries with the debug data
- intact. The files can restored now or just held for later use. Note
- that several of the files cannot be copied directly after rebooting
- to the new LFS system. Later use requires booting to another system,
- mounting the LFS partition, and then copying the files.
-
-cp -av /var/dbg/lib/* /lib
-cp -av /var/dbg/usr/lib/* /usr/lib
-
diff --git a/general.ent b/general.ent
index e3e8328ad..6af933a36 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-
+
-
+
-
+
diff --git a/packages.ent b/packages.ent
index 84efe056a..20f00f3e5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -145,10 +145,10 @@
-
-
+
+
-
+
@@ -258,10 +258,10 @@
-
-
+
+
-
+
@@ -392,12 +392,12 @@
-
+
-
+
-
+