Merge upstream

Makefile

@@ -165,40 +165,46 @@ profile-html:
                 stylesheets/lfs-xsl/profile.xsl      \
 	             $(RENDERTMP)/lfs-full.xml
 
-wget-list: $(BASEDIR)/wget-list
+wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV)
 $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
                       packages.ent patches.ent general.ent
 	@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
 	$(Q)mkdir -p $(BASEDIR)
-
-#	$(Q)xsltproc --nonet --xinclude                    \
-#                --stringparam profile.revision $(REV) \
-#                --output $(RENDERTMP)/sysd-wget.xml   \
-#                stylesheets/lfs-xsl/profile.xsl       \
-#                chapter03/chapter03.xml
-
 	$(Q)xsltproc --xinclude --nonet            \
                 --output $(BASEDIR)/wget-list \
 	             stylesheets/wget-list.xsl     \
                 chapter03/chapter03.xml
 
+$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \
+                             chapter03/chapter03.xml \
+                             packages.ent patches.ent general.ent
+	$(Q)xsltproc --nonet --xinclude                   \
+                --stringparam profile.revision $(REV) \
+                --output $(RENDERTMP)/wget-list.xml   \
+                stylesheets/lfs-xsl/profile.xsl       \
+                chapter03/chapter03.xml
+	$(Q)xsltproc --xinclude --nonet                  \
+                --output $(BASEDIR)/wget-list-$(REV) \
+                stylesheets/wget-list.xsl            \
+                $(RENDERTMP)/wget-list.xml
+
 md5sums: $(BASEDIR)/md5sums
 $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
                     packages.ent patches.ent
 	@echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..."
 	$(Q)mkdir -p $(BASEDIR)
 
-	$(Q)xsltproc --nonet --xinclude                    \
+	$(Q)xsltproc --nonet --xinclude                   \
                 --stringparam profile.revision $(REV) \
                 --stringparam profile.arch $(ARCH)    \
-                --output $(RENDERTMP)/sysv-md5sum.xml \
+                --output $(RENDERTMP)/md5sum.xml      \
                 stylesheets/lfs-xsl/profile.xsl       \
                 chapter03/chapter03.xml
 
-	$(Q)xsltproc --xinclude --nonet          \
+	$(Q)xsltproc --xinclude --nonet         \
                 --output $(BASEDIR)/md5sums \
                 stylesheets/md5sum.xsl      \
-                $(RENDERTMP)/sysv-md5sum.xml
+                $(RENDERTMP)/md5sum.xml
 	$(Q)sed -i -e \
        "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.xz | cut -d' ' -f1)/" \
        $(BASEDIR)/md5sums

chapter03/introduction.xml

@@ -79,11 +79,11 @@
   </itemizedlist>
 
   <para>To download all of the packages and patches by using
-  <ulink url="../wget-list">wget-list</ulink> as an input to the
+  <ulink url="../&wget-list;">&wget-list;</ulink>
-  <command>wget</command> command, use:</para>
+  as an input to the <command>wget</command> command, use:</para>
-
-<screen role="nodump"><userinput>wget --input-file=wget-list --continue --directory-prefix=$LFS/sources</userinput></screen>
 
+<screen role="nodump"><userinput>wget --input-file=&wget-list; --continue --directory-prefix=$LFS/sources</userinput></screen>
+<!--
   <note><para>
     The <filename>wget-list</filename> file mentioned above retrieves all
     packages for both the sysV and systemd versions of LFS.  There are a total
@@ -91,7 +91,7 @@
     <filename>md5sums</filename> file mentioned below is specific to the
     current book.
   </para></note>
-
+-->
   <para>Additionally, starting with LFS-7.0, there is a separate file,
   <ulink url="../md5sums">md5sums</ulink>, which can be used to verify that all
   the correct packages are available before proceeding.  Place that file in

chapter08/binutils.xml

@@ -190,15 +190,13 @@ cd       build</userinput></screen>
     <para>Test the results:</para>
 
 <screen><userinput remap="test">make -k check</userinput></screen>
-<!--
-    <para>Four tests related to zlib are known to fail.</para>
--->
-<!--
-    <para>Seven gold tests are known to fail with gcc-11.1.0</para>
 
-    <para>Four ld tests named <quote>Run property ...</quote> are known to
+    <!-- Will be fixed in 2.39
-    fail.</para>
+         https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=01ae03b -->
- -->
+    <para>One gold test, <filename>pr17704a_test</filename>, is known to
+    fail if <parameter>CONFIG_IA32_EMULATION</parameter> is disabled in the
+    kernel configuration of the host system.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make tooldir=/usr install</userinput></screen>

chapter08/glibc.xml

@@ -180,10 +180,22 @@ esac</userinput></screen>
       </listitem>
 
       <listitem>
-        <para>The <emphasis>nss/tst-nss-files-hosts-multi</emphasis>
+        <para>Some tests, for example
-        test is known to fail on relatively slow systems due to an internal
+        <emphasis>nss/tst-nss-files-hosts-multi</emphasis>,
+        are known to fail on relatively slow systems due to an internal
         timeout.</para>
       </listitem>
+
+      <!--
+        https://lists.linuxfromscratch.org/sympa/arc/lfs-support/2022-06/msg00022.html
+        https://sourceware.org/pipermail/libc-alpha/2022-June/139839.html
+      -->
+      <listitem>
+        <para>About 27 tests, for example <emphasis>elf/tst-pldd</emphasis>,
+        are known to fail if the kernel supports namespaces (see
+        <filename>namespaces(7)</filename> for details) but the host distro
+        has disabled them via sysctl.</para>
+      </listitem>
 <!--
       <listitem>
         <para>The <emphasis>rt/tst-cputimer{1,2,3}</emphasis> tests depend on

general.ent

@@ -72,6 +72,13 @@
 <!ENTITY copyrightdate   "%crdate;">
 ]]>
 
+<![ %sysv; [
+<!ENTITY wget-list       "wget-list-sysv">
+]]>
+<![ %systemd; [
+<!ENTITY wget-list       "wget-list-systemd">
+]]>
+
 <!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">
 <!ENTITY blfs-book       "&blfs-root;view/&short-version;/">