aboutsummaryrefslogtreecommitdiffstats
path: root/chapter8/systemd.sh
diff options
context:
space:
mode:
authorWilliam Harrington <kb0iic@berzerkula.org>2021-05-28 19:42:21 -0500
committerWilliam Harrington <kb0iic@berzerkula.org>2021-05-28 19:42:21 -0500
commit4b7cae034764b66323dd2e103696bc6fc54b1e03 (patch)
treee9eba5010883c84857a75103d1f095c39f26ad17 /chapter8/systemd.sh
parentb566078843c66db25d975a146a0b7ae2d5b7de1e (diff)
Adjust sysconfdir for e2fsprogs, adjust systemd manpages archive/commands.
Diffstat (limited to 'chapter8/systemd.sh')
-rw-r--r--chapter8/systemd.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/chapter8/systemd.sh b/chapter8/systemd.sh
index a9c8172..23a8c3c 100644
--- a/chapter8/systemd.sh
+++ b/chapter8/systemd.sh
@@ -1,15 +1,12 @@
#!/bin/bash
set -e
-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 \
@@ -37,13 +34,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 &&