Changeset 7263646

Timestamp:

07/29/2023 04:19:59 AM (14 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, multilib, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/update-glibc

Children:

2cf01ab7, da2e8cb

Parents:

83e616f (diff), c2ccad1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter08/systemd.xml (modified) (3 diffs)

chapter01/changelog.xml

@@ -58 +58 @@
         </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>

chapter08/systemd.xml

@@ -40 +40 @@
   <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,
@@ -206 +193 @@
     <!-- 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
@@ -245 +234 @@
         <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,