diff options
| author | Xi Ruoyao <xry111@mengyan1223.wang> | 2021-03-05 19:43:12 +0000 |
|---|---|---|
| committer | Xi Ruoyao <xry111@mengyan1223.wang> | 2021-03-05 19:43:12 +0000 |
| commit | 35e0479cb7cf02711618a14fc4f2a21a7e898d96 (patch) | |
| tree | 86cf5e8967da57c05b3daf793e208b72489c8b84 /chapter08 | |
| parent | 06addba1bf3a118e47393051aed253f237a2b3d3 (diff) | |
systemd: simplify systemd man page installation
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12155 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter08')
| -rw-r--r-- | chapter08/systemd.xml | 23 |
1 files changed, 12 insertions, 11 deletions
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> |