Changeset ceebda5 for chapter08/systemd.xml

Timestamp:

03/31/2021 10:41:41 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

61385ca

Parents:

eef83ea

git-author:

Thomas Trepl <thomas@…> (03/30/2021 08:47:28 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:41 AM)

Message:

Merge changes from trunk to multilib

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@12176 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

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

chapter08/systemd.xml

@@ -47 +47 @@
 -->
 
-    <para>First, apply a patch to fix some regressions:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>Create a symlink to work around the xsltproc command not being installed:</para>
-
-<screen><userinput remap="pre">ln -sf /bin/true /usr/bin/xsltproc</userinput></screen>
-
-    <para>Set up the man pages:</para>
-
-<screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
+    <!-- For linux-5.11's API headers changing the rfkill_event structure -->
+    <para>First, apply a patch to fix some regressions and fix functionality
+    with future versions of the kernel:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.patch</userinput></screen>
 
     <para>Remove tests that cannot be built in chroot:</para>
@@ -96 +90 @@
       -Dhomed=false                 \
       -Duserdb=false                \
-      -Dman=true                    \
+      -Dman=false                   \
       -Dmode=release                \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
@@ -192 +186 @@
 
       <varlistentry>
+        <term><parameter>-Dman=false</parameter></term>
+        <listitem>
+          <para>Prevent the generation of man pages to avoid extra
+          dependencies.  We will install pre-generated man pages for systemd
+          from a tarball later.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>-Dmode=release</parameter></term>
         <listitem>
@@ -209 +212 @@
 <screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
 
-    <para>Remove an unnecessary symbolic link:</para>
-
-<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
+    <para>Install the man pages:</para>
+
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
 
     <para>Remove a useless directory:</para>