Changeset 479d3bc for chapter08/systemd.xml

Timestamp:

08/02/2024 09:44:22 AM (7 weeks ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/loongarch, xry111/loongarch-12.2

Children:

e7eaa1e

Parents:

7c1451f (diff), 5ff15e6 (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 remote-tracking branch 'origin/trunk' into xry111/loongarch

File:

• chapter08/systemd.xml (modified) (18 diffs)

chapter08/systemd.xml

@@ -49 +49 @@
        -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
 
-    <!-- https://github.com/systemd/systemd/pull/30549 -->
-    <para>Now fix a security vulnerability in the DNSSEC verification of
-    <command>systemd-resolved</command> and a bug breaking running
-    <command>systemd-analyze verify</command> on an instantiated systemd
-    unit:</para>
-
-<screen><userinput remap='pre'>patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
-
     <para>Prepare systemd for compilation:</para>
 
@@ -63 +55 @@
 
 CFLAGS+=" -Wno-format-overflow" \
-meson setup \
-      --prefix=/usr                 \
-      --buildtype=release           \
-      -Ddefault-dnssec=no           \
-      -Dfirstboot=false             \
-      -Dinstall-tests=false         \
-      -Dldconfig=false              \
-      -Dsysusers=false              \
-      -Drpmmacrosdir=no             \
-      -Dhomed=disabled              \
-      -Duserdb=false                \
-      -Dman=disabled                \
-      -Dmode=release                \
-      -Dpamconfdir=no               \
-      -Ddev-kvm-mode=0660           \
-      -Dnobody-group=nogroup        \
-      -Dsysupdate=disabled          \
-      -Dukify=disabled              \
-      -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
-      ..</userinput></screen>
+meson setup ..                \
+      --prefix=/usr           \
+      --buildtype=release     \
+      -D default-dnssec=no    \
+      -D firstboot=false      \
+      -D install-tests=false  \
+      -D ldconfig=false       \
+      -D sysusers=false       \
+      -D rpmmacrosdir=no      \
+      -D homed=disabled       \
+      -D userdb=false         \
+      -D man=disabled         \
+      -D mode=release         \
+      -D pamconfdir=no        \
+      -D dev-kvm-mode=0660    \
+      -D nobody-group=nogroup \
+      -D sysupdate=disabled   \
+      -D ukify=disabled       \
+      -D docdir=/usr/share/doc/systemd-&systemd-version;</userinput></screen>
 
     <variablelist>
@@ -97 +88 @@
 
       <varlistentry>
-        <term><parameter>-Ddefault-dnssec=no</parameter></term>
+        <term><parameter>-D default-dnssec=no</parameter></term>
         <listitem>
           <para>This switch turns off the experimental DNSSEC support.</para>
@@ -104 +95 @@
 
       <varlistentry>
-        <term><parameter>-Dfirstboot=false</parameter></term>
+        <term><parameter>-D firstboot=false</parameter></term>
         <listitem>
           <para>This switch prevents installation of systemd
@@ -114 +105 @@
 
       <varlistentry>
-        <term><parameter>-Dinstall-tests=false</parameter></term>
+        <term><parameter>-D install-tests=false</parameter></term>
         <listitem>
           <para>This switch prevents installation of the compiled tests.</para>
@@ -121 +112 @@
 
       <varlistentry>
-        <term><parameter>-Dldconfig=false</parameter></term>
+        <term><parameter>-D ldconfig=false</parameter></term>
         <listitem>
           <para>This switch prevents installation of a systemd unit that runs
@@ -131 +122 @@
 
       <varlistentry>
-        <term><parameter>-Dsysusers=false</parameter></term>
+        <term><parameter>-D sysusers=false</parameter></term>
         <listitem>
           <para>This switch prevents installation of systemd
@@ -143 +134 @@
 
       <varlistentry>
-        <term><parameter>-Drpmmacrosdir=no</parameter></term>
+        <term><parameter>-D rpmmacrosdir=no</parameter></term>
         <listitem>
           <para>This switch disables installation of RPM Macros
@@ -151 +142 @@
 
       <varlistentry>
-        <term><parameter>-Dhomed=disabled</parameter> and
-        <parameter>-Duserdb=false</parameter></term>
+        <term><parameter>-D homed=disabled</parameter> and
+        <parameter>-D userdb=false</parameter></term>
         <listitem>
           <para>Remove two daemons with dependencies that do not fit
@@ -160 +151 @@
 
       <varlistentry>
-        <term><parameter>-Dman=disabled</parameter></term>
+        <term><parameter>-D man=disabled</parameter></term>
         <listitem>
           <para>Prevent the generation of man pages to avoid extra
@@ -169 +160 @@
 
       <varlistentry>
-        <term><parameter>-Dmode=release</parameter></term>
+        <term><parameter>-D mode=release</parameter></term>
         <listitem>
           <para>Disable some features considered experimental by upstream.
@@ -177 +168 @@
 
       <varlistentry>
-        <term><parameter>-Dpamconfdir=no</parameter></term>
+        <term><parameter>-D pamconfdir=no</parameter></term>
         <listitem>
           <para>Prevent the installation of a PAM configuration file not
@@ -185 +176 @@
 
       <varlistentry>
-        <term><parameter>-Ddev-kvm-mode=0660</parameter></term>
+        <term><parameter>-D dev-kvm-mode=0660</parameter></term>
         <listitem>
           <para>The default udev rule would allow all users to access
@@ -194 +185 @@
 
       <varlistentry>
-        <term><parameter>-Dnobody-group=nogroup</parameter></term>
+        <term><parameter>-D nobody-group=nogroup</parameter></term>
         <listitem>
           <para>Tell the package the group name with GID 65534 is
@@ -202 +193 @@
 
       <varlistentry>
-        <term><parameter>-Dsysupdate=disabled</parameter></term>
+        <term><parameter>-D sysupdate=disabled</parameter></term>
         <listitem>
           <para>Do not install the <command>systemd-sysupdate</command>
@@ -213 +204 @@
 
       <varlistentry>
-        <term><parameter>-Dukify=disabled</parameter></term>
+        <term><parameter>-D ukify=disabled</parameter></term>
         <listitem>
           <para>Do not install the <command>systemd-ukify</command> script.
@@ -234 +225 @@
 ninja test</userinput></screen>
 
-    <!-- This test needs /run/systemd/inaccessible/sock, which only exists
+    <!-- test-namespace needs /run/systemd/inaccessible/sock, which only exists
          after initializing the system with systemd.  -->
     <para>One test named <literal>systemd:core / test-namespace</literal>
@@ -248 +239 @@
     <!-- 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-version;.tar.xz \
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz \
     --no-same-owner --strip-components=1   \
     -C /usr/share/man</userinput></screen>