systemd: simplify systemd man page installation

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

3 files changed, 25 insertions, 13 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 18d954e43..93b6b1cc4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,16 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
     <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>
         <listitem>
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index e701376df..b52a64e35 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -52,14 +52,6 @@
 
 <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>
 
 <screen><userinput remap="pre">sed '181,$ d' -i src/resolve/meson.build</userinput></screen>
@@ -97,7 +89,7 @@ meson --prefix=/usr                 \
       -Drpmmacrosdir=no             \
       -Dhomed=false                 \
       -Duserdb=false                \
-      -Dman=true                    \
+      -Dman=false                   \
       -Dmode=release                \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..</userinput></screen>
@@ -193,6 +185,15 @@ meson --prefix=/usr                 \
       </varlistentry>
 
       <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>
           <para>Disable some features considered experimental by upstream.
@@ -210,9 +211,9 @@ meson --prefix=/usr                 \
 
 <screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
 
-    <para>Remove an unnecessary symbolic link:</para>
+    <para>Install the man pages:</para>
 
-<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
+<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>
 
diff --git a/packages.ent b/packages.ent
index 49893af9f..0ecf68c7c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -630,10 +630,11 @@
 <!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
 <!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">