Index: bootscripts/ChangeLog
===================================================================
--- bootscripts/ChangeLog	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ bootscripts/ChangeLog	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -1,2 +1,5 @@
+2020-08-02 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Fix a minor display problem in checkfs
+
 2019-10-31 DJ Lucas <dj@linuxfromscratch.org>
    * Syslog should not start in runlevel 2 due to network logging
Index: bootscripts/lfs/init.d/checkfs
===================================================================
--- bootscripts/lfs/init.d/checkfs	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ bootscripts/lfs/init.d/checkfs	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -95,5 +95,5 @@
          msg="\nWARNING:\n\nFile system errors "
          msg="${msg}were found and have been corrected.\n"
-         msg="${msg}     You may want to double-check that "
+         msg="${msg}      You may want to double-check that "
          msg="${msg}everything was fixed properly."
          log_warning_msg "$msg"
Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter01/changelog.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -45,4 +45,42 @@
     <listitem>
       <itemizedlist>
+      <para>2020-08-04</para>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.21. Fixes
+          <ulink url="&lfs-ticket-root;4704">#4704</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to binutils-2.35. Fixes
+          <ulink url="&lfs-ticket-root;4702">#4702</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-10.2.0. Fixes
+          <ulink url="&lfs-ticket-root;4701">#4701</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to check-0.15.1. Fixes
+          <ulink url="&lfs-ticket-root;4700">#4700</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bison-3.7.1. Fixes
+          <ulink url="&lfs-ticket-root;4699">#4699</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux 2.36.0. Fixes
+          <ulink url="&lfs-ticket-root;4698">#4698</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.42. Fixes
+          <ulink url="&lfs-ticket-root;4703">#4703</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.7.12. Fixes
+          <ulink url="&lfs-ticket-root;4697">#4697</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <itemizedlist>
       <para>2020-07-21</para>
         <listitem>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter01/whatsnew.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -49,7 +49,7 @@
       <para>Bc &bc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Bison-&bison-version;</para>
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter03/patches.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -27,5 +27,5 @@
     </varlistentry>
 
-
+<!--
     <varlistentry>
       <term>Binutils Fix for gold Test Suite Patch - <token>&binutils-gold-test-patch-size;</token>:</term>
@@ -35,5 +35,5 @@
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
@@ -59,5 +59,5 @@
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>GCC Cross Build Fix Patch - <token>&gcc-cross-patch-size;</token>:</term>
@@ -67,5 +67,5 @@
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
@@ -73,4 +73,12 @@
         <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>
         <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&libpipeline-checks-patch;"/></para>
+        <para>MD5 sum: <literal>&libpipeline-checks-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: chapter04/creatingminlayout.xml
===================================================================
--- chapter04/creatingminlayout.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter04/creatingminlayout.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -9,7 +9,7 @@
   <?dbhtml filename="creatingminlayout.html"?>
 
-  <title>Creating the Minimal directory layout in LFS filesystem</title>
+  <title>Creating a limited directory layout in LFS filesystem</title>
 
-  <para>The first task performed in the LFS partition is to create a minimal
+  <para>The first task performed in the LFS partition is to create a limited
   directory hierarchy so that programs compiled in <xref
   linkend="chapter-temporary-tools"/> may be installed in their final
@@ -20,5 +20,5 @@
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>mkdir -pv $LFS/{usr,lib,var,etc,bin,sbin}
+<screen><userinput>mkdir -pv $LFS/{bin,etc,lib,sbin,usr,var}
 case $(uname -m) in
   x86_64) mkdir -pv $LFS/lib64 ;;
Index: chapter06/gcc-pass2.xml
===================================================================
--- chapter06/gcc-pass2.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter06/gcc-pass2.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -63,10 +63,10 @@
   ;;
 esac</userinput></screen>
-
+<!--
     <para>Fix an issue with GCC-10.1 when building with a cross
     compiler:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&gcc-cross-patch;</userinput></screen>
-
+-->
     <para>Create a separate build directory again:</para>
 
Index: chapter07/chapter07.xml
===================================================================
--- chapter07/chapter07.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter07/chapter07.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -19,6 +19,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++-pass2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
Index: chapter07/creatingdirs.xml
===================================================================
--- chapter07/creatingdirs.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter07/creatingdirs.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -16,4 +16,8 @@
     required in the previous chapters by issuing the following command:</para>
 
+  <note><para>Some of the directories below have already been created earlier
+  with explicit instructions or when installing some packages.  They are
+  repeated below for completeness.</para></note>
+
 <screen><userinput>mkdir -pv /{boot,home,mnt,opt,srv}</userinput></screen>
 
@@ -31,6 +35,6 @@
 mkdir -pv /var/lib/{color,misc,locate}
 
-ln -sv /run /var/run
-ln -sv /run/lock /var/lock
+ln -sfv /run /var/run
+ln -sfv /run/lock /var/lock
 
 install -dv -m 0750 /root
Index: chapter08/binutils.xml
===================================================================
--- chapter08/binutils.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter08/binutils.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -59,9 +59,7 @@
 
     <para>Now remove one test that prevents the tests from running
-    to completion, and fix other tests in the gold test suite, which
-    need to be adjusted for GCC 10:</para>
-
-<screen><userinput remap="pre">sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in
-patch -Np1 -i ../binutils-&binutils-version;-gcc10_gold_test_fix-1.patch</userinput></screen>
+    to completion:</para>
+
+<screen><userinput remap="pre">sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in</userinput></screen>
 
     <para>The Binutils documentation recommends building Binutils 
Index: chapter08/libcap.xml
===================================================================
--- chapter08/libcap.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter08/libcap.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -46,5 +46,5 @@
     <para>Prevent a static library from being installed:</para>
 
-<screen><userinput remap="pre">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i '/install -m.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen>
 
     <para>Compile the package:</para>
Index: chapter08/libpipeline.xml
===================================================================
--- chapter08/libpipeline.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter08/libpipeline.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -41,4 +41,8 @@
   <sect2 role="installation">
     <title>Installation of Libpipeline</title>
+
+    <para>First, fix the files in the test suite:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&libpipeline-checks-patch;</userinput></screen>
 
     <para>Prepare Libpipeline for compilation:</para>
Index: chapter08/pkgmgt.xml
===================================================================
--- chapter08/pkgmgt.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter08/pkgmgt.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -39,5 +39,5 @@
 
   <para>There are some hints written on the topic of package management. Visit
-  the <ulink url="&hints-index;">Hints Project</ulink> and see if one of them
+  the <ulink url="&hints-root;">Hints Project</ulink> and see if one of them
   fits your need.</para>
 
@@ -232,5 +232,5 @@
 
       <para>This scheme, unique to LFS, was devised by Matthias Benkmann, and is
-      available from the <ulink url="&hints-index;">Hints Project</ulink>. In
+      available from the <ulink url="&hints-root;">Hints Project</ulink>. In
       this scheme, each package is installed as a separate user into the
       standard locations. Files belonging to a package are easily identified by
Index: chapter08/procps.xml
===================================================================
--- chapter08/procps.xml	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ chapter08/procps.xml	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -73,5 +73,5 @@
 
 <screen><userinput remap="make">make</userinput></screen>
-
+<!--
     <para>The test suite needs some custom modifications for LFS.
     Remove a test that fails when scripting does not use a tty device and
@@ -83,4 +83,8 @@
 rm testsuite/pgrep.test/pgrep.exp
 make check</userinput></screen>
+-->
+    <para> To run the test suite, run:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
Index: general.ent
===================================================================
--- general.ent	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ general.ent	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -1,12 +1,12 @@
-<!ENTITY version         "SVN-20200721">
+<!ENTITY version         "SVN-20200804">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20200721-systemd">
+<!ENTITY versiond        "20200804-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "July 21st, 2020">
+<!ENTITY releasedate     "August 4th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
Index: packages.ent
===================================================================
--- packages.ent	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ packages.ent	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -66,8 +66,8 @@
 <!ENTITY bc-fin-sbu "0.1 SBU">
 
-<!ENTITY binutils-version "2.34">
-<!ENTITY binutils-size "21,131 KB">
+<!ENTITY binutils-version "2.35">
+<!ENTITY binutils-size "21,526 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz">
-<!ENTITY binutils-md5 "664ec3a2df7805ed3464639aaae332d6">
+<!ENTITY binutils-md5 "fc8d55e2f6096de8ff8171173b6f5087">
 <!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-tmpp1-du "611 MB">
@@ -78,8 +78,8 @@
 <!ENTITY binutils-fin-sbu "6.6 SBU">
 
-<!ENTITY bison-version "3.6.4">
-<!ENTITY bison-size "2,415 KB">
+<!ENTITY bison-version "3.7">
+<!ENTITY bison-size "2,545 KB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
-<!ENTITY bison-md5 "08bf8aa8334d7f817b7b24509ef412bf">
+<!ENTITY bison-md5 "58439732ae3a0cefc598773c84f1641f">
 <!ENTITY bison-home "&gnu-software;bison/">
 <!ENTITY bison-tmp-du "47 MB">
@@ -96,8 +96,8 @@
 <!ENTITY bzip2-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY check-version "0.15.0">
+<!ENTITY check-version "0.15.1">
 <!ENTITY check-size "757 KB">
 <!ENTITY check-url "&github;/libcheck/check/releases/download/&check-version;/check-&check-version;.tar.gz">
-<!ENTITY check-md5 "77b27bd48f9b16844c2f62333639a246">
+<!ENTITY check-md5 "4b22423bb2dddd0f965465d02b568d7b">
 <!ENTITY check-home "https://libcheck.github.io/check">
 <!ENTITY check-fin-du "12 MB">
@@ -218,8 +218,8 @@
 <!ENTITY gawk-fin-sbu "0.4 SBU">
 
-<!ENTITY gcc-version "10.1.0">
-<!ENTITY gcc-size "72,844 KB">
+<!ENTITY gcc-version "10.2.0">
+<!ENTITY gcc-size "73,247 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-<!ENTITY gcc-md5 "7d48e00245330c48b670ec9a2c518291">
+<!ENTITY gcc-md5 "e9fd9b1789155ad09bcf3ae747596b50">
 <!ENTITY gcc-home "https://gcc.gnu.org/">
 <!ENTITY gcc-tmpp1-du "3.7 GB">
@@ -247,8 +247,8 @@
 <!ENTITY gdbm-fin-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.20.2">
-<!ENTITY gettext-size "9,292 KB">
+<!ENTITY gettext-version "0.21">
+<!ENTITY gettext-size "9,487 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "0cf5f68338d5d941bbf9ac93b847310f">
+<!ENTITY gettext-md5 "40996bbaf7d1356d3c22e33a8b255b31">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-tmp-du "303 MB">
@@ -376,5 +376,5 @@
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20191031">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20200802">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">        
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
@@ -384,8 +384,8 @@
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.40">
-<!ENTITY libcap-size "135 KB">
+<!ENTITY libcap-version "2.42">
+<!ENTITY libcap-size "138 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "c7b2c60f8d0f2f46d37b2bf74e6eeee6">
+<!ENTITY libcap-md5 "f22cd619e04ae7b88a6a0c109b9523eb">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "11 MB">
@@ -418,10 +418,10 @@
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "7">
-<!ENTITY linux-patch-version "9">
+<!ENTITY linux-patch-version "12">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "110,080 KB">
+<!ENTITY linux-size "110,093 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "09d5fc3f89c9c0e607af7b0b0344b480">
+<!ENTITY linux-md5 "76bfc439430bc6596f1b0bcfc9ccff5c">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
@@ -690,9 +690,9 @@
 <!ENTITY udev-lfs-home    " ">
 
-<!ENTITY util-linux-minor "2.35">
-<!ENTITY util-linux-version "2.35.2"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "5,030 KB">
+<!ENTITY util-linux-minor "2.36">
+<!ENTITY util-linux-version "2.36"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "5,120 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "248a4d0810c9193e0e9a4bb3f26b93d8">
+<!ENTITY util-linux-md5 "fe7c0f7e439f08970e462c9d44599903">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-tmp-du "129 MB">
Index: patches.ent
===================================================================
--- patches.ent	(revision 17ca5488d27f8e05df3740ba4018082e70adb223)
+++ patches.ent	(revision ba82c18266bee10819e8a3cc2e8db8aaac6e1ff3)
@@ -7,7 +7,9 @@
 <!ENTITY bash-fixes-patch-size "22 KB">
 
+<!--
 <!ENTITY binutils-gold-test-patch "binutils-&binutils-version;-gcc10_gold_test_fix-1.patch">
 <!ENTITY binutils-gold-test-patch-md5 "d18aaf9b25830cb8f7a5d44aa3febe28">
 <!ENTITY binutils-gold-test-patch-size "5.0 KB">
+-->
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
@@ -24,9 +26,9 @@
 <!ENTITY flex-fixes-patch-size "3.4 KB">
 -->
-
+<!--
 <!ENTITY gcc-cross-patch "gcc-&gcc-version;-cet_fix-1.patch">
 <!ENTITY gcc-cross-patch-md5 "f37d8a6b4c943a6f8eaf541923fed838">
 <!ENTITY gcc-cross-patch-size "4.3 KB">
-
+-->
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
@@ -42,4 +44,8 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
+
+<!ENTITY libpipeline-checks-patch "libpipeline-&libpipeline-version;-check_fixes-2.patch">
+<!ENTITY libpipeline-checks-patch-md5 "5b2a4f93153c8a7b40ddc9cfeb83d1c1">
+<!ENTITY libpipeline-checks-patch-size "ww KB">
 <!--
 <!ENTITY ninja-limit-jobs-patch "ninja-&ninja-version;-add_NINJAJOBS_var-1.patch">
