From 1f201845a30b83f242a5f8ed35a80db17522752b Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 31 Oct 2021 14:00:21 -0500
Subject: Package updates Update to gawk-5.1.1. Update to meson-0.60.0. Update
 to libcap-2.60. Update to gdbm-1.22. Update to file-5.41. Update to
 linux-5.14.15. Update to iana-etc-20211025. Update to tzdata-2021e.

Change /bin to /usr/bin in passwd, and revisedchroot.
Fix systemd for new meson.
---
 chapter08/bash.xml          | 2 +-
 chapter08/file.xml          | 4 ----
 chapter08/gcc.xml           | 5 ++++-
 chapter08/revisedchroot.xml | 2 +-
 chapter08/systemd.xml       | 6 +++++-
 5 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'chapter08')

diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index 699a24e43..36bbcf0d9 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -94,7 +94,7 @@ EOF</userinput></screen>
     <para>Run the newly compiled <command>bash</command> program (replacing the one that is
     currently being executed):</para>
 
-<screen role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
+ <screen role="nodump"><userinput>exec /usr/bin/bash --login +h</userinput></screen>
 
     <note>
       <para>The parameters used make the <command>bash</command>
diff --git a/chapter08/file.xml b/chapter08/file.xml
index 8baf349b1..eb9f41a2b 100644
--- a/chapter08/file.xml
+++ b/chapter08/file.xml
@@ -41,10 +41,6 @@
   <sect2 role="installation">
     <title>Installation of File</title>
 
-    <para>First, fix a few regressions in File:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../file-&file-version;-upstream_fixes-1.patch</userinput></screen>
-
     <para>Prepare File for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index fc8748fc3..a37e37774 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -105,7 +105,10 @@ cd       build</userinput></screen>
 
     <important>
       <para>In this section, the test suite for GCC is considered
-      critical. Do not skip it under any circumstance.</para>
+      important, but it takes a long time. First time builders are 
+      encouraged to not skip it.  The time to run the tests can be
+      reduced significantly by adding -jx to the make command below
+      where x is the number of cores on your system.</para>
     </important>
 
    <para>One set of tests in the GCC test suite is known to exhaust the default
diff --git a/chapter08/revisedchroot.xml b/chapter08/revisedchroot.xml
index 3071240af..bc519d491 100644
--- a/chapter08/revisedchroot.xml
+++ b/chapter08/revisedchroot.xml
@@ -24,7 +24,7 @@ chroot "$LFS" /usr/bin/env -i          \
     HOME=/root TERM="$TERM"            \
     PS1='(lfs chroot) \u:\w\$ '        \
     PATH=/usr/bin:/usr/sbin            \
-    /bin/bash --login</userinput></screen>
+    /usr/bin/bash --login</userinput></screen>
 
   <para>Here the <parameter>+h</parameter> option is not used anymore, since
   all the previous programs have been replaced: hashing is therefore
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index f003a1c47..46719cc27 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -56,9 +56,13 @@
     <systemitem class="groupname">sgx</systemitem>, from the default udev
     rules:</para>
 
- <screen><userinput remap="pre"> sed -i -e 's/GROUP="render"/GROUP="video"/' \
+ <screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
         -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
 
+    <para>Fix a mesaon problem:</para>
+
+ <screen><userinput remap="pre">sed -i 's/+ want_libfuzzer.*$/and want_libfuzzer/' meson.build</userinput></screen>
+
     <para>Prepare systemd for compilation:</para>
 
 <screen><userinput remap="configure">mkdir -p build
-- 
cgit v1.2.3-54-g00ecf