diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-04-21 11:06:04 -0500 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-04-21 11:06:04 -0500 |
| commit | 78aa56a3063028ca2ecf1b5adbe32f9131b26154 (patch) | |
| tree | 7c12168d9c4319da12e99cfd914a197fca26a91b | |
| parent | 6f03d3daf5f3497171830220faf5d17d5d9296fc (diff) | |
Update systemd to 248 and remove unneeded systemd upstream patch.
| -rw-r--r-- | chapter8/systemd.sh | 9 | ||||
| -rw-r--r-- | packages-systemd.csv | 2 | ||||
| -rw-r--r-- | patches-systemd.csv | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/chapter8/systemd.sh b/chapter8/systemd.sh index 7b9f562..d0363db 100644 --- a/chapter8/systemd.sh +++ b/chapter8/systemd.sh @@ -1,13 +1,15 @@ #!/bin/bash set -e -patch -Np1 -i ../systemd-"${VERSION}"-upstream_fixes-2.patch && -sed '181,$ d' -i src/resolve/meson.build && +sed '177,222 d' -i src/resolve/meson.build && 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 \ @@ -35,6 +37,9 @@ 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 && diff --git a/packages-systemd.csv b/packages-systemd.csv index def2db9..67b91d8 100644 --- a/packages-systemd.csv +++ b/packages-systemd.csv @@ -1,3 +1,3 @@ d-bus,1.12.20,https://dbus.freedesktop.org/releases/dbus/dbus-@.tar.gz,dfe8a71f412e0b53be26ed4fbfdc91c4 -systemd,247,https://github.com/systemd/systemd/archive/v@/systemd-@.tar.gz,b0d6e603b814908acc69db29bbfb023c +systemd,248,https://github.com/systemd/systemd/archive/v@/systemd-@.tar.gz,00131adf0e98c1fd8a7fde4eb47f10c8 systemd-man-pages,247,http://anduin.linuxfromscratch.org/LFS/systemd-man-pages-@-2.tar.xz,7d8a53105b7a205f2863e360d9a23f95 diff --git a/patches-systemd.csv b/patches-systemd.csv index 61a3b5a..e69de29 100644 --- a/patches-systemd.csv +++ b/patches-systemd.csv @@ -1 +0,0 @@ -systemd,247,http://www.linuxfromscratch.org/patches/lfs/development/systemd-@-upstream_fixes-2.patch,7afe3d13464ae7d20dbe5e6f0fb8ccd3 |