Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -39,6 +39,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem revision="systemd">
+      <para>2022-11-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to systemd-252. Fixes
+          <ulink url="&lfs-ticket-root;5150">#5150</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-11-01</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -238,9 +238,9 @@
     <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
     </listitem>-->

chapter03/patches.xml

@@ -135,6 +135,7 @@
       </listitem>
     </varlistentry>
 
+<!--
     <varlistentry revision="systemd">
       <term>Systemd Upstream Patch - <token>&systemd-upstream-patch-size;</token>:</term>
       <listitem>
@@ -142,6 +143,7 @@
         <para>MD5 sum: <literal>&systemd-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
 <!--
     <varlistentry>
       <term>Xz Upstream Fix Patch - <token>&xz-upstream-fix-patch-size;</token>:</term>

chapter08/systemd.xml

@@ -40,9 +40,11 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
 
+<!--
     <para>First, fix an issue introduced by glibc-2.36.</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
+-->
 
     <para>Remove two unneeded groups,
     <systemitem class="groupname">render</systemitem> and
@@ -202,6 +204,10 @@ meson --prefix=/usr                 \
 
 <screen><userinput remap="adjust">systemctl disable systemd-sysupdate</userinput></screen>
 
+    <para>Also disable that unit's timer:</para>
+
+<screen><userinput remap="adjust">systemd disable systemd-sysupdate-reboot.timer</userinput></screen>
+
 <!-- dev: 50-pid-max.conf is not removed in BLFS, so I commented the following out.
           If it causes any trouble, we can add this back and also copy it into BLFS -->
 <!--

packages.ent

@@ -646,22 +646,22 @@
 <!ENTITY sysklogd-fin-du "0.6 MB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "251">
+<!ENTITY systemd-version  "252">
 <!--<!ENTITY systemd-stable   "6b4878d">-->
 <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
      change that is incompatible, we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size     "11,168 KB">
+<!ENTITY systemd-size     "11,488 KB">
 <!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
 <!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5      "8090fcccc3a2ec20995e89d56fed61b1">
+<!ENTITY systemd-md5      "b9456750a212dd54d81caeb3c38134b6">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-version "251">
+<!ENTITY systemd-man-version "252">
-<!ENTITY systemd-man-size "596 KB">
+<!ENTITY systemd-man-size "628 KB">
 <!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
-<!ENTITY systemd-man-md5  "87053ffef1cfb74e4fe28f627e12a2a4">
+<!ENTITY systemd-man-md5  "856ffb33ac16962f0628dcb533d76e5c">
-<!ENTITY systemd-fin-du   "251 MB">
+<!ENTITY systemd-fin-du   "258 MB">
-<!ENTITY systemd-fin-sbu  "2.3 SBU">
+<!ENTITY systemd-fin-sbu  "2.5 SBU">
 
 <!ENTITY sysvinit-version "3.04">
 <!ENTITY sysvinit-size "216 KB">

part3intro/toolchaintechnotes.xml

@@ -201,7 +201,7 @@
     is slightly adjusted by changing the "vendor" field in the
     <envar>LFS_TGT</envar> variable so it says &quot;lfs&quot;. We also use the
     <parameter>--with-sysroot</parameter> option when building the cross-linker and
-    cross-compiler to tell them where to find the needed host files. This
+    cross-compiler, to tell them where to find the needed host files. This
     ensures that none of the other programs built in <xref
     linkend="chapter-temporary-tools"/> can link to libraries on the build
     machine. Only two stages are mandatory, plus one more for tests.</para>
@@ -238,8 +238,8 @@
     on a machine using the already installed distribution. <quote>On
     lfs</quote> means the commands are run in a chrooted environment.</para>
 
-    <para>Now, there is more about cross-compiling: the C language is not
+    <para>This is not yet the end of the story. The C language is not
-    just a compiler, but also defines a standard library. In this book, the
+    merely a compiler; it also defines a standard library. In this book, the
     GNU C library, named glibc, is used (there is an alternative, &quot;musl&quot;). This library must
     be compiled for the LFS machine; that is, using the cross-compiler cc1.
     But the compiler itself uses an internal library providing complex
@@ -256,22 +256,22 @@
     <para>The upshot of the preceding paragraph is that cc1 is unable to
     build a fully functional libstdc++ with the degraded libgcc, but cc1
     is the only compiler available for building the C/C++ libraries
-    during stage 2. Of course, the compiler built by stage 2, cc-lfs,
+    during stage 2. There are two reasons we don't immediately use the
-    would be able to build those libraries, but:</para>
+    compiler built in stage 2, cc-lfs, to build those libraries.</para>
 
     <itemizedlist>
       <listitem>
         <para>
-          Generally cc-lfs cannot run on pc (the host distro).  Despite the
+          Generally speaking, cc-lfs cannot run on pc (the host system).  Even though the
-          triplets of pc and lfs are compatible to each other, an executable
+          triplets for pc and lfs are compatible with each other, an executable
-          for lfs will depend on glibc-&glibc-version; while the host distro
+          for lfs must depend on glibc-&glibc-version;; the host distro
-          may utilize a different libc implementation (for example, musl) or
+          may utilize either a different implementation of libc (for example, musl), or
           a previous release of glibc (for example, glibc-2.13).
         </para>
       </listitem>
       <listitem>
         <para>
-          Even if cc-lfs happens to run on pc, using it on pc would create
+          Even if cc-lfs can run on pc, using it on pc would create
           a risk of linking to the pc libraries, since cc-lfs is a native
           compiler.
         </para>
@@ -279,16 +279,16 @@
     </itemizedlist>
 
     <para>So when we build gcc stage 2, we instruct the building system to
-    rebuild libgcc and libstdc++ with cc1, but link libstdc++ to the newly
+    rebuild libgcc and libstdc++ with cc1, but we link libstdc++ to the newly
-    rebuilt libgcc instead of the degraded build.  Then the rebuilt
+    rebuilt libgcc instead of the old, degraded build.  This makes the rebuilt
-    libstdc++ will be fully functional.</para>
+    libstdc++ fully functional.</para>
 
     <para>In &ch-final; (or <quote>stage 3</quote>), all the packages needed for
     the LFS system are built. Even if a package has already been installed into
     the LFS system in a previous chapter, we still rebuild the package.  The main reason for
-    rebuilding these packages is to make them stable: if we reinstall a LFS
+    rebuilding these packages is to make them stable: if we reinstall an LFS
-    package on a complete LFS system, the installed content of the package
+    package on a completed LFS system, the reinstalled content of the package
-    should be the same as the content of the same package when installed in
+    should be the same as the content of the same package when first installed in
     &ch-final;.  The temporary packages installed in &ch-tmp-cross; or
     &ch-tmp-chroot; cannot satisfy this requirement, because some of them
     are built without optional dependencies, and autoconf cannot

patches.ent

@@ -91,9 +91,11 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
 
+<!--
 <!ENTITY systemd-upstream-patch "systemd-&systemd-version;-glibc_2.36_fix-1.patch">
 <!ENTITY systemd-upstream-patch-md5 "fd8dc901e73ad00dc72a351a0d4ac48c">
 <!ENTITY systemd-upstream-patch-size "3.0 KB">
+-->
 <!--
 <!ENTITY xz-upstream-fix-patch "xz-&xz-version;-upstream_fix-1.patch">
 <!ENTITY xz-upstream-fix-patch-md5 "584c72ea3d8f7502b2770670f3090788">