Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -44,9 +44,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
     <listitem>
       <para>2021-05-12</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Removed instructions for running tests
+          in Python due to an idefinite hang in the partial
+          LFS envrionment.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Moved LFS to a merged-/usr configuration. Thanks
           goes to Xi Ruoyao for doing almost all of the work. Fixes
@@ -57,7 +63,7 @@
           <ulink url="&lfs-ticket-root;4847">#4847</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[renodr] - Fix a FTBFS when building glibc-2.30 with
+          <para>[renodr] - Fix a FTBFS when building glibc-2.33 with
           gcc-11.1.0.</para>
         </listitem>
         <listitem revision="systemd">

chapter08/python.xml

@@ -44,11 +44,12 @@
 
     <para>Prepare Python for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr       \
-            --enable-shared     \
-            --with-system-expat \
-            --with-system-ffi   \
-            --with-ensurepip=yes</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr        \
+            --enable-shared      \
+            --with-system-expat  \
+            --with-system-ffi    \
+            --with-ensurepip=yes \
+            --enable-optimizations</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -77,20 +78,24 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term><parameter>--enable-optimizations</parameter></term>
+      <listitem>
+        <para>This switch enables stable, but expensive, optimizations.</para>
+      </listitem>
+    </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results, issue:</para> 
-
-<screen><userinput remap="test">make test</userinput></screen>
-
-    <para>Some tests requiring a network connection or additional packages are
-    skipped. The tests test_unicodedata and test_curses tests are known to fail. For
-    more comprehensive results, the tests can be rerun when Python 3 is 
-    reinstalled in BLFS.</para>
+    <para>Running the tests at this point is not recommended.  The
+    tests are known to hang indefinitely in the partial LFS environment.
+    If desired, the tests can be rerun at the end of this chapter or
+    when Python 3 is reinstalled in BLFS.  To run the tests anyway,
+    issue <command>make test</command>.</para>
 
     <para>Install the package:</para>
 

chapter08/shadow.xml

@@ -73,7 +73,7 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \;</userinput></s
 
     <note>
       <para>If <filename class="directory">/bin</filename> and/or
-      <filename class="directory">/sbin</filename> are prefereed to be
+      <filename class="directory">/sbin</filename> are preferred to be
       left over in <envar>PATH</envar> for some reason, modify
       <envar>PATH</envar> in <filename>.bashrc</filename> after LFS is
       built.</para>

chapter08/systemd.xml

@@ -861,8 +861,7 @@ rm -f /usr/bin/xsltproc</userinput></screen>
       <varlistentry id="systemd-sysext">
         <term><command>systemd-sysext</command></term>
         <listitem>
-          <para>Creates, deletes, and manages system extensions through the
-          systemd-sysextd daemon</para>
+          <para>Activates system extension images</para>
           <indexterm zone="ch-system-systemd systemd-sysext">
             <primary sortas="b-systemd-sysext">systemd-sysext</primary>
           </indexterm>