aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2023-07-28 23:19:59 -0500
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2023-07-28 23:19:59 -0500
commit72636463a282a41a28c1e131ba3ebd81cee6f677 (patch)
treeb6a0da375fef9c0d55acb61bb89b58e27cf66a48
parent83e616f79e84539b34d912b4a4ed430e00b86839 (diff)
parentc2ccad14a5ed01857b84199133d7468ccd02c461 (diff)
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
-rw-r--r--chapter01/changelog.xml3
-rw-r--r--chapter08/systemd.xml23
2 files changed, 9 insertions, 17 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d5debd345..ac551a947 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -57,7 +57,8 @@
<ulink url='&lfs-ticket-root;5287'>#5287</ulink>.</para>
</listitem>
<listitem>
- <para>[bdubbs] - Update to systemd-254. Fixes
+ <para>[bdubbs] - Update to<phrase revision='sysv'> udev
+ from</phrase> systemd-254. Fixes
<ulink url='&lfs-ticket-root;5293'>#5293</ulink>.</para>
</listitem>
<listitem>
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index e99167d07..63003ac68 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -40,19 +40,6 @@
<sect2 role="installation">
<title>Installation of systemd</title>
- <para>
- Remove several inappropriate uses of the <literal>pure</literal>
- attribute that cause runtime issues when the package is built
- with gcc-13 or later:
- </para>
-
-<screen><userinput remap='pre'>sed '/bus_message_type_from_string/s/_pure_//' \
- -i src/libsystemd/sd-bus/bus-internal.h &amp;&amp;
-sed '/devt_hash_func/s/_pure_//' \
- -i src/basic/hash-funcs.h &amp;&amp;
-sed '/job_get_timeout/s/_pure_//' \
- -i src/core/job.h</userinput></screen>
-
<para>Remove two unneeded groups,
<systemitem class="groupname">render</systemitem> and
<systemitem class="groupname">sgx</systemitem>, from the default udev
@@ -205,7 +192,9 @@ meson setup \
<!-- Please make sure systemd man pages tarball has a common leading
component in the path. -->
-<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-version;.tar.xz \
+ --no-same-owner --strip-components=1 \
+ -C /usr/share/man</userinput></screen>
<para>Create the <filename>/etc/machine-id</filename> file needed by
<command>systemd-journald</command>:</para>
@@ -244,12 +233,14 @@ meson setup \
<seglistitem>
<seg>busctl, coredumpctl, halt (symlink to systemctl),
hostnamectl, init, journalctl, kernel-install, localectl, loginctl,
- machinectl, networkctl, oomctl, portablectl, poweroff (symlink to
+ machinectl, mount.ddi (symlink to systemd-dissect), 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-ac-power, systemd-analyze,
systemd-ask-password, systemd-cat, systemd-cgls, systemd-cgtop,
- systemd-creds, systemd-delta, systemd-detect-virt,
+ systemd-confext (symlink to systemd-sysext), systemd-creds,
+ 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,