[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)

[Christian Hesse]

    Date: Thursday, February 10, 2022 @ 07:06:20
  Author: eworm
Revision: 436847

upgpkg: systemd 250.3-4: fix initcpio generation with glibc 2.35-1 (FS#73702)

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/initcpio-install-systemd

--------------------------+
 PKGBUILD                 |    4 ++--
 initcpio-install-systemd |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-10 01:29:56 UTC (rev 436846)
+++ PKGBUILD	2022-02-10 07:06:20 UTC (rev 436847)
@@ -7,7 +7,7 @@
 _tag='d066a4f747b225d47c5f5c97a8843d30878995b8' # git rev-parse v${_tag_name}
 _tag_name=250.3
 pkgver="${_tag_name/-/}"
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -44,7 +44,7 @@
             'SKIP'
             'cc0c2ffb5f7c3a7176cd68f3dddd85ca000dcc4cdf3044746a20147234adb6811800fd28a4713faa6a59bf8c02be9fd43c2d6aa6695fd1dbf03ae773a91d090c'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            '5479c8ef963ff247381392907c13308b4ae3a9383c867bd4c8a318b159f23acdb4be5f4ddae0dab4665f4927d3f30166077b1d3aaa2cde6bf53d023b7abb939c'
+            '8167dd8f610fd98e3de4360cacd0020d3691cd1a989591a6db2f0d1277ce96880e64753bdbed759c6cf4b95d39b5d2415b4d9810e369e50e59655742174ff51c'
             'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'

Modified: initcpio-install-systemd
===================================================================
--- initcpio-install-systemd	2022-02-10 01:29:56 UTC (rev 436846)
+++ initcpio-install-systemd	2022-02-10 07:06:20 UTC (rev 436847)
@@ -121,7 +121,11 @@
     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' \