From f7cea723fc9485c7a0a0f97643a01b97928c6b2b Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Thu, 27 Dec 2018 14:00:05 +0000
Subject: Update to systemd-240 Update to linux-4.19.12 (Not doing 4.20 yet)
 Update to e2fsprogs-1.44.5 Update to bison-3.2.4 Update to sed-4.7 Update to
 grep-3.3 Update to Python-3.7.2 Update to groff-1.22.4

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11495 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/systemd.xml | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 7afcb3aa8..53b7a9199 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -53,20 +53,12 @@ done</userinput></screen>
 
     <para>Set up the man pages:</para>
 
-<screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz</userinput></screen>
+<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 '166,$ d' -i src/resolve/meson.build</userinput></screen>
-<!--
-    <para>Apply a patch to fix a build failure with glibc-2.28:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-glibc_statx_fix-1.patch</userinput></screen>
+<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
 
-    <para>Apply a patch to fix a build failure with meson-0.48.0:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-meson-0.48.0_fixes-1.patch</userinput></screen>
--->
     <para>Remove an unneeded group,
     <systemitem class="groupname">render</systemitem>, from the default udev
     rules:</para>
@@ -194,17 +186,6 @@ meson --prefix=/usr                \
     <para>Remove an unnecessary directory:</para>
 
 <screen><userinput remap="install">rm -rfv /usr/lib/rpm
-<!--
-    <para>Create the Sysvinit compatibility symlinks, so systemd is used
-    as the default init system:</para>
-
-<screen><userinput remap="install">for tool in runlevel reboot shutdown poweroff halt telinit; do
-     ln -sfv ../bin/systemctl /sbin/${tool}
-done
-ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
-
-    <para>Remove our earlier created symlink for xsltproc:</para>
--->
 rm -f /usr/bin/xsltproc</userinput></screen>
 
     <para>Create the <filename>/etc/machine-id</filename> file needed by
-- 
cgit v1.2.3-54-g00ecf