Changeset 35e0479


Ignore:
Timestamp:
03/05/2021 07:43:12 PM (8 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, ml-11.0, multilib, trunk, xry111/git-transition, xry111/glibc-2.34, 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:
3 edited

Legend:

Unmodified
Added
Removed
  • chapter01/changelog.xml

    r06addba r35e0479  
    4444    -->
    4545    <listitem revision="systemd">
     46      <para>2021-03-05</para>
     47      <itemizedlist>
     48        <listitem>
     49          <para>[xry111] - Simplify the installation of systemd man pages.
     50          </para>
     51        </listitem>
     52      </itemizedlist>
     53    </listitem>
     54
     55    <listitem revision="systemd">
    4656      <para>2021-03-04</para>
    4757      <itemizedlist>
  • chapter08/systemd.xml

    r06addba r35e0479  
    5252
    5353<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.patch</userinput></screen>
    54 
    55     <para>Create a symlink to work around the xsltproc command not being installed:</para>
    56 
    57 <screen><userinput remap="pre">ln -sf /bin/true /usr/bin/xsltproc</userinput></screen>
    58 
    59     <para>Set up the man pages:</para>
    60 
    61 <screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
    6254
    6355    <para>Remove tests that cannot be built in chroot:</para>
     
    9890      -Dhomed=false                 \
    9991      -Duserdb=false                \
    100       -Dman=true                    \
     92      -Dman=false                   \
    10193      -Dmode=release                \
    10294      -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
     
    194186
    195187      <varlistentry>
     188        <term><parameter>-Dman=false</parameter></term>
     189        <listitem>
     190          <para>Prevent the generation of man pages to avoid extra
     191          dependencies.  We will install pre-generated man pages for systemd
     192          from a tarball later.</para>
     193        </listitem>
     194      </varlistentry>
     195
     196      <varlistentry>
    196197        <term><parameter>-Dmode=release</parameter></term>
    197198        <listitem>
     
    211212<screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
    212213
    213     <para>Remove an unnecessary symbolic link:</para>
    214 
    215 <screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
     214    <para>Install the man pages:</para>
     215
     216<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
    216217
    217218    <para>Remove a useless directory:</para>
  • packages.ent

    r06addba r35e0479  
    631631<!ENTITY systemd-md5      "b0d6e603b814908acc69db29bbfb023c">
    632632<!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
     633<!ENTITY systemd-man-version "247-2">
    633634<!ENTITY systemd-man-size "612 KB">
    634635<!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
    635 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
    636 <!ENTITY systemd-man-md5  "438c98be200e1c3b308e58a3399d4465">
     636<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
     637<!ENTITY systemd-man-md5  "7d8a53105b7a205f2863e360d9a23f95">
    637638<!ENTITY systemd-fin-du   "264 MB">
    638639<!ENTITY systemd-fin-sbu  "1.8 SBU">
Note: See TracChangeset for help on using the changeset viewer.