Merge Xi's changes into trunk

Update to meson-0.58.0
Update to systemd-248
Update to gcc-11.1.0
Update to linux-5.12.1
Update to iproute2-5.12.0
Update to Python-3.9.5
Make /bin, /sbin, and /lib symlinks to their counterparts in /usr.
Thanks again for a significant portion of this work goes to Xi, I only
really merged it and made a couple of modifications for my updates. To
LFS 11.x we go!

1 files changed, 45 insertions, 46 deletions

diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index d5a9f6bd1..c5df6bf78 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -47,14 +47,13 @@
 -->
 
     <!-- For linux-5.11's API headers changing the rfkill_event structure -->
-    <para>First, apply a patch to fix some regressions and fix functionality
-    with future versions of the kernel:</para>
+    <para>First, apply a patch to fix some build issues:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-3.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
 
     <para>Remove tests that cannot be built in chroot:</para>
 
-<screen><userinput remap="pre">sed '181,$ d' -i src/resolve/meson.build</userinput></screen>
+<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
 
     <para>Remove an unneeded group,
     <systemitem class="groupname">render</systemitem>, from the default udev
@@ -76,15 +75,8 @@ meson --prefix=/usr                 \
       -Ddefault-dnssec=no           \
       -Dfirstboot=false             \
       -Dinstall-tests=false         \
-      -Dkmod-path=/bin/kmod         \
       -Dldconfig=false              \
-      -Dmount-path=/bin/mount       \
-      -Drootprefix=                 \
-      -Drootlibdir=/lib             \
-      -Dsplit-usr=true              \
-      -Dsulogin-path=/sbin/sulogin  \
       -Dsysusers=false              \
-      -Dumount-path=/bin/umount     \
       -Db_lto=false                 \
       -Drpmmacrosdir=no             \
       -Dhomed=false                 \
@@ -98,14 +90,6 @@ meson --prefix=/usr                 \
       <title>The meaning of the meson options:</title>
 
       <varlistentry>
-        <term><parameter>-D*-path=*</parameter></term>
-        <listitem>
-          <para>These switches provide the location of binaries needed by
-          systemd at runtime that have not yet been installed.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>-Ddefault-dnssec=no</parameter></term>
         <listitem>
           <para>This switch turns off the experimental DNSSEC support.</para>
@@ -140,24 +124,6 @@ meson --prefix=/usr                 \
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>-Droot*</parameter></term>
-        <listitem>
-          <para>These switches ensure that core programs and
-          shared libraries are installed in subdirectories
-          of the root partition.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>-Dsplit-usr=true</parameter></term>
-        <listitem>
-          <para>This switch ensures that systemd will work on
-          systems where /bin, /lib and /sbin directories are not
-          symlinks to their /usr counterparts.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>-Dsysusers=false</parameter></term>
         <listitem>
           <para>This switch prevents installation of systemd
@@ -257,26 +223,27 @@ meson --prefix=/usr                 \
       <seglistitem>
         <seg>bootctl, busctl, coredumpctl, halt (symlink to systemctl),
         hostnamectl, init, journalctl, kernel-install, localectl, loginctl,
-        machinectl, networkctl, portablectl, poweroff (symlink to
+        machinectl, networkctl, oomctl, portablectl, poweroff (symlink to
         systemctl), reboot (symlink to systemctl), resolvconf (symlink to
         resolvectl), resolvectl, runlevel (symlink to systemctl), shutdown
         (symlink to systemctl), systemctl, systemd-analyze,
         systemd-ask-password, systemd-cat, systemd-cgls, systemd-cgtop,
-        systemd-delta, systemd-detect-virt, systemd-dissect, systemd-escape, 
-        systemd-hwdb, systemd-id128, systemd-inhibit, systemd-machine-id-setup,
+        systemd-cryptenroll, systemd-delta, systemd-detect-virt,
+        systemd-dissect, systemd-escape, systemd-hwdb, systemd-id128,
+        systemd-inhibit, systemd-machine-id-setup,
         systemd-mount, systemd-notify, systemd-nspawn, systemd-path,
         systemd-repart, systemd-resolve (symlink to resolvectl), systemd-run,
-        systemd-socket-activate, systemd-stdio-bridge, systemd-tmpfiles,
-        systemd-tty-ask-password-agent, systemd-umount (symlink to
-        systemd-mount), telinit (symlink to systemctl), timedatectl, and
-        udevadm</seg>
+        systemd-socket-activate, systemd-stdio-bridge, systemd-sysext,
+        systemd-tmpfiles, systemd-tty-ask-password-agent,
+        systemd-umount (symlink to systemd-mount),
+        telinit (symlink to systemctl), timedatectl, and udevadm</seg>
         <seg>libnss_myhostname.so.2, libnss_mymachines.so.2,
         libnss_resolve.so.2, libnss_systemd.so.2,
-        libsystemd.so, libsystemd-shared-&systemd-version;.so (in /lib/systemd),
+        libsystemd.so, libsystemd-shared-&systemd-version;.so (in /usr/lib/systemd),
         and libudev.so</seg>
         <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
-        /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
+        /etc/xdg/systemd, /usr/lib/systemd, /usr/lib/udev, /usr/include/systemd,
         /usr/lib/binfmt.d, /usr/lib/environment.d, /usr/lib/kernel, 
         /usr/lib/modules-load.d, /usr/lib/sysctl.d, /usr/lib/systemd, 
         /usr/lib/tmpfiles.d,
@@ -423,6 +390,16 @@ meson --prefix=/usr                 \
         </listitem>
       </varlistentry>
 
+      <varlistentry id="oomctl">
+        <term><command>oomctl</command></term>
+        <listitem>
+          <para>Controls the systemd Out Of Memory daemon</para>
+          <indexterm zone="ch-system-systemd oomctl">
+            <primary sortas="b-oomctl">oomctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="portablectl">
         <term><command>portablectl</command></term>
         <listitem>
@@ -568,6 +545,17 @@ meson --prefix=/usr                 \
         </listitem>
       </varlistentry>
 
+      <varlistentry id="systemd-cryptenroll">
+        <term><command>systemd-cryptenroll</command></term>
+        <listitem>
+          <para>Is used to enroll or remove a system from full disk encryption,
+          as well as set and query private keys and recovery keys</para>
+          <indexterm zone="ch-system-systemd systemd-cryptenroll">
+            <primary sortas="b-systemd-cryptenroll">systemd-cryptenroll</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="systemd-delta">
         <term><command>systemd-delta</command></term>
         <listitem>
@@ -743,6 +731,17 @@ meson --prefix=/usr                 \
         </listitem>
       </varlistentry>
 
+      <varlistentry id="systemd-sysext">
+        <term><command>systemd-sysext</command></term>
+        <listitem>
+          <para>Creates, deletes, and manages system extensions through the
+          systemd-sysextd daemon</para>
+          <indexterm zone="ch-system-systemd systemd-sysext">
+            <primary sortas="b-systemd-sysext">systemd-sysext</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="systemd-tmpfiles">
         <term><command>systemd-tmpfiles</command></term>
         <listitem>