From f0cf50b19420418596fcdf28d2c1cc3582681f54 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Fri, 28 May 2021 19:42:21 -0500
Subject: Adjust sysconfdir for e2fsprogs, adjust systemd manpages
 archive/commands.

---
 chapter8/systemd.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'chapter8/systemd.sh')

diff --git a/chapter8/systemd.sh b/chapter8/systemd.sh
index 98137a9..276e4df 100644
--- a/chapter8/systemd.sh
+++ b/chapter8/systemd.sh
@@ -1,14 +1,11 @@
 #!/bin/bash
 
-sed '177,222 d' -i src/resolve/meson.build &&
+patch -Np1 -i ../systemd-"${VERSION}"-upstream_fixes-1.patch &&
 sed -i 's/GROUP="render"/GROUP="video"/' rules.d/50-udev-default.rules.in &&
 
 mkdir -v build
 cd build || exit 1
 
-ln -sfv /bin/true /usr/bin/xsltproc
-ln -sfv /bin/true /usr/bin/rsync
-
 LANG=en_US.UTF-8 \
 meson --prefix=/usr \
       --sysconfdir=/etc \
@@ -36,13 +33,10 @@ meson --prefix=/usr \
       -Ddocdir=/usr/share/doc/systemd-"${VERSION}" \
       .. &&
 
-rm -v /usr/bin/rsync
-rm -v /usr/bin/xsltproc
-
 LANG=en_US.UTF-8 ninja &&
 
 LANG=en_US.UTF-8 ninja install &&
-tar -xvf ../../systemd-man-pages-"247"-2.tar.xz \
+tar -xvf ../../systemd-man-pages-"${VERSION}".tar.xz \
     --strip-components=1 -C /usr/share/man &&
 rm -rfv /usr/lib/pam.d &&
 systemd-machine-id-setup &&
-- 
cgit v1.2.3-54-g00ecf