diff options
| -rw-r--r-- | libre/systemd/PKGBUILD | 29 | ||||
| -rw-r--r-- | libre/systemd/initcpio-install-systemd | 6 | ||||
| -rw-r--r-- | libre/systemd/systemd.install | 3 |
3 files changed, 21 insertions, 17 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index 59f947306..1215b4121 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -14,7 +14,7 @@ pkgname+=("${_systemd_libs[@]/#/systemd-}") _tag='d066a4f747b225d47c5f5c97a8843d30878995b8' # git rev-parse v${_tag_name} _tag_name=250.3 pkgver="${_tag_name/-/}" -pkgrel=1 +pkgrel=4 pkgrel+=.parabola1 arch=('x86_64') arch+=('i686' 'armv7h' 'ppc64le') @@ -27,7 +27,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync') makedepends_i686=('gnu-efi-libs' 'pkgconf') makedepends_x86_64=('gnu-efi-libs') -options=('strip') +options=('debug' 'strip') validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net> 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com> '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> @@ -63,7 +63,7 @@ sha512sums=('SKIP' 'SKIP' 'cc0c2ffb5f7c3a7176cd68f3dddd85ca000dcc4cdf3044746a20147234adb6811800fd28a4713faa6a59bf8c02be9fd43c2d6aa6695fd1dbf03ae773a91d090c' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '5479c8ef963ff247381392907c13308b4ae3a9383c867bd4c8a318b159f23acdb4be5f4ddae0dab4665f4927d3f30166077b1d3aaa2cde6bf53d023b7abb939c' + '8167dd8f610fd98e3de4360cacd0020d3691cd1a989591a6db2f0d1277ce96880e64753bdbed759c6cf4b95d39b5d2415b4d9810e369e50e59655742174ff51c' 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6' '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8' '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9' @@ -89,6 +89,8 @@ sha512sums=('SKIP' '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839') _backports=( + # bus: Use OrderedSet for introspection + 'acac88340ace3cd631126eebb6d0390cd54e8231' ) _reverts=( @@ -123,17 +125,18 @@ prepare() { build() { local _timeservers=({0..3}.arch.pool.ntp.org) local _nameservers=( - # We use these public name services, ordered by their - # privacy policy (hopefully): + # We use these public name services, ordered by their privacy policy (hopefully): # * Cloudflare (https://1.1.1.1/) - # * Quad9 without filtering (https://www.quad9.net/) + # * Quad9 (https://www.quad9.net/) # * Google (https://developers.google.com/speed/public-dns/) - 1.1.1.1#cloudflare-dns.com - 9.9.9.10#dns.quad9.net - 8.8.8.8#dns.google - 2606:4700:4700::1111#cloudflare-dns.com - 2620:fe::10#dns.quad9.net - 2001:4860:4860::8888#dns.google + # TODO: go back to cloudflare? Currently it is unusable with systemd-resolved... + # https://community.cloudflare.com/t/ttl-for-cnames/354506 + #'1.1.1.1#cloudflare-dns.com' + '9.9.9.9#dns.quad9.net' + '8.8.8.8#dns.google' + #'2606:4700:4700::1111#cloudflare-dns.com' + '2620:fe::9#dns.quad9.net' + '2001:4860:4860::8888#dns.google' ) if [ "$CARCH" = "armv7h" ]; then @@ -183,7 +186,7 @@ build() { arch-meson "$pkgbase-stable" build "${_meson_options[@]}" - ninja -C build + meson compile -C build # Go ahead and split the package now. It's easier this way, because # we can use mv instead of awkward, error-prone rm/cp pairs. diff --git a/libre/systemd/initcpio-install-systemd b/libre/systemd/initcpio-install-systemd index 961bdbb1e..d416e9707 100644 --- a/libre/systemd/initcpio-install-systemd +++ b/libre/systemd/initcpio-install-systemd @@ -121,7 +121,11 @@ build() { add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" - add_binary "$(readlink -f /usr/lib/libnss_files.so)" + # This code moved to glibc with 2.35-1, so the shared library is just empty. + # Keep it for the time being - but with final file name - for older glibc packages. + # TODO: Remove once settled! + add_binary '/usr/lib/libnss_files.so.2' + printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \ 'passwd: files' \ 'group: files' \ diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install index cece9d2de..536e54d1b 100644 --- a/libre/systemd/systemd.install +++ b/libre/systemd/systemd.install @@ -36,9 +36,6 @@ post_install() { getty@tty1.service \ remote-fs.target - echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" - echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" - # group 'systemd-journal-remote' is created by systemd-sysusers mkdir -m2755 var/log/journal/remote chgrp systemd-journal-remote var/log/journal/remote |