diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 18d954e43..93b6b1cc4 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -42,6 +42,16 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2021-03-05 + + + [xry111] - Simplify the installation of systemd man pages. + + + + + 2021-03-04 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 @@ patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.patch - Create a symlink to work around the xsltproc command not being installed: - -ln -sf /bin/true /usr/bin/xsltproc - - Set up the man pages: - -tar -xf ../systemd-man-pages-&systemd-version;.tar.xz - Remove tests that cannot be built in chroot: sed '181,$ d' -i src/resolve/meson.build @@ -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; \ .. @@ -192,6 +184,15 @@ meson --prefix=/usr \ + + -Dman=false + + Prevent the generation of man pages to avoid extra + dependencies. We will install pre-generated man pages for systemd + from a tarball later. + + + -Dmode=release @@ -210,9 +211,9 @@ meson --prefix=/usr \ LANG=en_US.UTF-8 ninja install - Remove an unnecessary symbolic link: + Install the man pages: -rm -f /usr/bin/xsltproc +tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man Remove a useless directory: diff --git a/packages.ent b/packages.ent index 49893af9f..0ecf68c7c 100644 --- a/packages.ent +++ b/packages.ent @@ -630,10 +630,11 @@ + - - + +