diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-05-28 19:42:21 -0500 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-05-28 19:43:09 -0500 |
| commit | f0cf50b19420418596fcdf28d2c1cc3582681f54 (patch) | |
| tree | 002e3d06f20365e5db0f5cec1bc9a67677ba5c7c | |
| parent | 147015bcb4ea03198bb0f7cc74beb4a044c73bd0 (diff) | |
Adjust sysconfdir for e2fsprogs, adjust systemd manpages archive/commands.
| -rw-r--r-- | chapter8/e2fsprogs.sh | 1 | ||||
| -rw-r--r-- | chapter8/systemd.sh | 10 | ||||
| -rw-r--r-- | packages-systemd.csv | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/chapter8/e2fsprogs.sh b/chapter8/e2fsprogs.sh index 48a9ead..2a1aa02 100644 --- a/chapter8/e2fsprogs.sh +++ b/chapter8/e2fsprogs.sh @@ -6,6 +6,7 @@ cd build || exit 1 ../configure --prefix=/usr \ --bindir=/bin \ --with-root-prefix="" \ + --sysconfdir=/etc \ --enable-elf-shlibs \ --disable-libblkid \ --disable-libuuid \ 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 && diff --git a/packages-systemd.csv b/packages-systemd.csv index 67b91d8..b127787 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,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 +systemd-man-pages,248,http://anduin.linuxfromscratch.org/LFS/systemd-man-pages-@.tar.xz,82cc641742df67128df8b6a55fbcbabc |