Changeset 35e0479

Timestamp:

03/05/2021 07:43:12 PM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, arm, ml-11.0, multilib, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/git-transition, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack, xry111/usr-move

Children:

14bfa91

Parents:

06addba

Message:

systemd: simplify systemd man page installation

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12155 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter08/systemd.xml (modified) (4 diffs)
• packages.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -44 +44 @@
     -->
     <listitem revision="systemd">
+      <para>2021-03-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Simplify the installation of systemd man pages.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision="systemd">
       <para>2021-03-04</para>
       <itemizedlist>

chapter08/systemd.xml

@@ -52 +52 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.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>
 
     <para>Remove tests that cannot be built in chroot:</para>
@@ -98 +90 @@
       -Dhomed=false                 \
       -Duserdb=false                \
-      -Dman=true                    \
+      -Dman=false                   \
       -Dmode=release                \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
@@ -194 +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>
@@ -211 +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>

packages.ent

@@ -631 +631 @@
 <!ENTITY systemd-md5      "b0d6e603b814908acc69db29bbfb023c">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
+<!ENTITY systemd-man-version "247-2">
 <!ENTITY systemd-man-size "612 KB">
 <!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
-<!ENTITY systemd-man-md5  "438c98be200e1c3b308e58a3399d4465">
+<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
+<!ENTITY systemd-man-md5  "7d8a53105b7a205f2863e360d9a23f95">
 <!ENTITY systemd-fin-du   "264 MB">
 <!ENTITY systemd-fin-sbu  "1.8 SBU">