aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas R. Reno <renodr@linuxfromscratch.org>2021-07-27 14:07:29 -0500
committerDouglas R. Reno <renodr@linuxfromscratch.org>2021-07-27 14:07:29 -0500
commitc9d3c70c4cd73bd254432192ae632f4ed9b23d40 (patch)
treeb49b73a765ef6e4fb8d3187d536dad4ee1edb651
parent953fd1f43393eb0f519c24bc6774bfcd256c40ee (diff)
parentd1592b9d92d8e47dbcd0c7db014d119c3793a7dd (diff)
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter08/strippingagain.xml3
2 files changed, 12 insertions, 1 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1b17760f2..ab4b04b7e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,16 @@
-->
<listitem>
+ <para>2021-07-27</para>
+ <itemizedlist>
+ <listitem>
+ <para>[xry111] - Use workaround for Glibc NSS modules during
+ stripping, to prevent bash from crash.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2021-07-26</para>
<itemizedlist>
<listitem>
diff --git a/chapter08/strippingagain.xml b/chapter08/strippingagain.xml
index e663f2d8e..196698f2a 100644
--- a/chapter08/strippingagain.xml
+++ b/chapter08/strippingagain.xml
@@ -62,7 +62,8 @@ online_usrbin="bash find strip"
online_usrlib="libbfd-&binutils-version;.so libdl-&glibc-version;.so
libhistory.so.&readline-version; libncursesw.so.&ncurses-version;
libm-&glibc-version;.so libreadline.so.&readline-version;
- libz.so.&zlib-version;"
+ libz.so.&zlib-version;
+ $(cd /usr/lib; find libnss*.so* -type f)"
for BIN in $online_usrbin; do
cp /usr/bin/$BIN /tmp/$BIN