From 5481e1f10166dad842cddd53fdc89b98b01eb8f4 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 23 Dec 2023 21:53:56 +0800
Subject: [PATCH] Update to systemd-255

---
 general/sysutils/systemd.xml       | 29 ++++++++++++++++++++++++-----
 introduction/welcome/changelog.xml | 10 ++++++++++
 packages.ent                       |  2 +-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/general/sysutils/systemd.xml b/general/sysutils/systemd.xml
index 026d3e0c8c..40577b671a 100644
--- a/general/sysutils/systemd.xml
+++ b/general/sysutils/systemd.xml
@@ -7,8 +7,8 @@
   <!--  <!ENTITY systemd-download-http "https://anduin.linuxfromscratch.org/LFS/systemd-&systemd-version;-&systemd-stable;.tar.xz"> For whenever we move to a stable snapshot for backports -->
   <!ENTITY systemd-download-http "https://github.com/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
   <!ENTITY systemd-download-ftp  " ">
-  <!ENTITY systemd-md5sum        "0d266e5361dc72097b6c18cfde1c0001">
-  <!ENTITY systemd-size          "14 MB">
+  <!ENTITY systemd-md5sum        "521cda27409a9edf0370c128fae3e690">
+  <!ENTITY systemd-size          "15 MB">
   <!ENTITY systemd-buildsize     "198 MB (with tests)">
   <!ENTITY systemd-time          "3.7 SBU (with tests using 4 cores)">
 
@@ -141,6 +141,7 @@
       <ulink url="https://developers.yubico.com/libfido2/">libfido2</ulink>,
       <ulink url="https://www.gnu.org/software/libmicrohttpd/">libmicrohttpd</ulink>,
       <ulink url="https://lz4.github.io/lz4/">lz4</ulink>,
+      <ulink url="https://pypi.org/project/pefile/">pefile</ulink>,
       <ulink url="https://pypi.org/project/pyelftools/">pyelftools</ulink>,
       <ulink url="https://sourceforge.net/projects/linuxquota/">quota-tools</ulink>,
       <ulink url="https://rpm.org/">rpm</ulink>,
@@ -202,13 +203,15 @@ meson setup ..                \
       -Dman=auto              \
       -Dsysusers=false        \
       -Drpmmacrosdir=no       \
-      -Dhomed=false           \
+      -Dhomed=disabled        \
       -Duserdb=false          \
       -Dmode=release          \
       -Dpam=true              \
       -Dpamconfdir=/etc/pam.d \
       -Ddev-kvm-mode=0660     \
       -Dnobody-group=nogroup  \
+      -Dsysupdate=disabled    \
+      -Dukify=disabled        \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; &amp;&amp;
 
 ninja</userinput></screen>
@@ -260,11 +263,27 @@ ninja</userinput></screen>
     </para>
 
     <para>
-      <parameter>-Dhomed=false</parameter>: Removes a daemon that does not offer
+      <parameter>-Dhomed=disabled</parameter>: Removes a daemon that does not offer
       any use under a traditional BLFS configuration, especially using accounts
       created with useradd. To enable systemd-homed, first ensure that you have
       <xref linkend="cryptsetup"/> and <xref linkend="libpwquality"/> installed,
-      and then change "false" to "true" in the above meson command.
+      and then change <quote>disabled</quote> to <quote>enabled</quote>
+      in the above <command>meson setup</command> command.
+    </para>
+
+    <para>
+      <parameter>-Dukify=disabled</parameter>: Removes a script for
+      combining a kernel, an initramfs, and a kernel command line etc.
+      into an UEFI application which can be loaded by the UEFI firmware
+      to start the embedded Linux kernel.  It's not needed for booting a
+      BLFS system with UEFI if following <xref linkend='grub-setup'/>.
+      And, it requires the <application>pefile</application> Python module
+      at runtime, so if it's enabled but <application>pefile</application>
+      is not installed, in the test suite one test for it will fail.  To
+      enable <command>systemd-ukify</command>, install the
+      <application>pefile</application> module and then change
+      <quote>disabled</quote> to <quote>enabled</quote> in the above
+      <command>meson setup</command> command.
     </para>
 
     <!-- EDITORS NOTE: Explanation on removing userdbd and homed:
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 662a41590f..1e478e0c30 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -38,6 +38,16 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>December 23nd, 2023</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to systemd-255. Fixes
+          <ulink url="&blfs-ticket-root;18978">#18978</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>December 22nd, 2023</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 9cc47a1dea..6749bf56f3 100644
--- a/packages.ent
+++ b/packages.ent
@@ -300,7 +300,7 @@
 <!ENTITY sg3_utils-version            "1.48">
 <!ENTITY sysmon-qt-version            "1.0">
 <!ENTITY sysstat-version              "12.7.4">
-<!ENTITY systemd-version              "254">
+<!ENTITY systemd-version              "255">
 <!ENTITY udisks2-version              "2.10.1">   <!-- stable lt .90 micro version -->
 <!ENTITY unrar-version                "6.2.12">
 <!ENTITY unzip-version                "6.0">