From 9afac649f272902fe78f5d83804f8d8270b6e62b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 17 Dec 2023 06:42:54 +0800
Subject: Update to systemd-255

---
 appendices/dependencies.xml |  1 +
 chapter01/changelog.xml     | 13 ++++++++++++-
 chapter08/systemd.xml       | 17 +++++++++++++++--
 chapter08/udev.xml          | 12 +++++++++---
 packages.ent                | 12 ++++++------
 5 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 30f2b05a6..3cbfe7b8b 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2935,6 +2935,7 @@
             <ulink url="&blfs-book;postlfs/make-ca.html">make-ca</ulink>,
             <ulink url="&blfs-book;postlfs/p11-kit.html">p11-kit</ulink>,
             <ulink url="&blfs-book;general/pcre2.html">PCRE2</ulink>,
+            <ulink url="&pypi-home;pefile">pefile</ulink>,
             <ulink url="&blfs-book;postlfs/polkit.html">Polkit</ulink>,
             <ulink url='&pypi-home;/pyelftools'>pyelftools</ulink>,
             <ulink url="&blfs-book;postlfs/qemu.html">qemu</ulink>,
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 58ec89bf0..d8182189f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,12 +40,23 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2023-12-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to <phrase revision='sysv'>udev
+          from </phrase>systemd-255.  Fixes
+          <ulink url='&lfs-ticket-root;5390'>#5390</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-12-14</para>
       <itemizedlist>
         <listitem>
            <para>[bdubbs] - Update to util-linux v2.39.3. Fixes
-           <ulink url='&lfs-ticket-root;5390'>#5390</ulink>.</para>
+           <ulink url='&lfs-ticket-root;5388'>#5388</ulink>.</para>
         </listitem>
         <listitem>
            <para>[bdubbs] - Update to python3-3.12.1. Fixes
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 761467acd..a1999e278 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -62,13 +62,14 @@ meson setup \
       -Dldconfig=false              \
       -Dsysusers=false              \
       -Drpmmacrosdir=no             \
-      -Dhomed=false                 \
+      -Dhomed=disabled              \
       -Duserdb=false                \
       -Dman=false                   \
       -Dmode=release                \
       -Dpamconfdir=no               \
       -Ddev-kvm-mode=0660           \
       -Dnobody-group=nogroup        \
+      -Dukify=disabled              \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..</userinput></screen>
 
@@ -139,7 +140,8 @@ meson setup \
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>-D{userdb,homed}=false</parameter></term>
+        <term><parameter>-Dhomed=disabled</parameter> and
+        <parameter>-Duserdb=false</parameter></term>
         <listitem>
           <para>Remove two daemons with dependencies that do not fit
           within the scope of LFS.</para>
@@ -187,6 +189,17 @@ meson setup \
           <systemitem class='groupname'>nogroup</systemitem>.</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Dukify=disabled</parameter></term>
+        <listitem>
+          <para>Do not install the <command>systemd-ukify</command> script.
+          At runtime this script requires the
+          <application>pefile</application> Python module that neither LFS
+          nor BLFS provides.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
diff --git a/chapter08/udev.xml b/chapter08/udev.xml
index dd686f489..967b3dd84 100644
--- a/chapter08/udev.xml
+++ b/chapter08/udev.xml
@@ -125,11 +125,18 @@ meson setup \
       </varlistentry>
     </variablelist>
 
+    <para>Get the list of the shipped udev helpers and save it into an
+    environment variable:</para>
+
+    <screen><userinput remap="make">udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \
+               awk '{print $3}' | tr -d ",'" | grep -v 'udevadm')</userinput></screen>
+
     <para>Only build the components needed for udev:</para>
 
     <screen><userinput remap="make">ninja udevadm systemd-hwdb                                           \
       $(ninja -n | grep -Eo '(src/(lib)?udev|rules.d|hwdb.d)/[^ ]*') \
-      $(realpath libudev.so --relative-to .)</userinput></screen>
+      $(realpath libudev.so --relative-to .)                         \
+      $udev_helpers udevadm</userinput></screen>
 
     <para>Install the package:</para>
 
@@ -147,8 +154,7 @@ install -vm644 rules.d/* ../rules.d/README         /usr/lib/udev/rules.d/
 install -vm644 $(find ../rules.d/*.rules \
                       -not -name '*power-switch*') /usr/lib/udev/rules.d/
 install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README} /usr/lib/udev/hwdb.d/
-install -vm755 $(find src/udev \
-                      -type f -not -name '*.*')    /usr/lib/udev
+install -vm755 $udev_helpers                       /usr/lib/udev
 install -vm644 ../network/99-default.link          /usr/lib/udev/network</userinput></screen>
 
     <para>Install some custom rules and support files useful in an LFS
diff --git a/packages.ent b/packages.ent
index 0d1a93f77..df970d61f 100644
--- a/packages.ent
+++ b/packages.ent
@@ -652,20 +652,20 @@
 <!ENTITY sysklogd-fin-du "680 KB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "254">
+<!ENTITY systemd-version  "255">
 <!--<!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     "13,985 KB">
+<!ENTITY systemd-size     "14,516 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      "0d266e5361dc72097b6c18cfde1c0001">
+<!ENTITY systemd-md5      "521cda27409a9edf0370c128fae3e690">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-version "254">
-<!ENTITY systemd-man-size "626 KB">
+<!ENTITY systemd-man-version "255">
+<!ENTITY systemd-man-size "652 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  "fc32faeac581e1890ca27fcea3858410">
+<!ENTITY systemd-man-md5  "1ebe54d7a80f9abf8f2d14ddfeb2432d">
 <!ENTITY systemd-fin-du   "238 MB">
 <!ENTITY systemd-fin-sbu  "0.7 SBU">
 
-- 
cgit v1.2.3-54-g00ecf