sync with testing/systemd

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

3 files changed, 19 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9bb86e4d9b6..43b5d38b954e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-git
 	pkgdesc = systemd (git version)
-	pkgver = 253.r62988.2208d96623
+	pkgver = 253.r63408.600362aa11
 	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
@@ -27,7 +27,7 @@ pkgbase = systemd-git
 	makedepends = python-lxml
 	makedepends = quota-tools
 	makedepends = shadow
-	makedepends = gnu-efi-libs
+	makedepends = python-pyelftools
 	makedepends = git
 	makedepends = meson
 	makedepends = libseccomp
@@ -69,7 +69,7 @@ pkgbase = systemd-git
 	source = 30-systemd-update.hook
 	sha512sums = SKIP
 	sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
-	sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
+	sha512sums = 4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e
 	sha512sums = 12f3c011a0164d28b092722639fff92c663c18b032d421695b0a72dbf123dd0908e3822087766ee922e131c02126f67ba2e1983c5cc244f5c4884dfed8605d00
 	sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6
 	sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
@@ -138,9 +138,9 @@ pkgname = systemd-git
 	optdepends = libp11-kit: support PKCS#11
 	optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
 	provides = nss-myhostname
-	provides = systemd-tools=253.r62988.2208d96623
-	provides = udev=253.r62988.2208d96623
-	provides = systemd=253.r62988.2208d96623
+	provides = systemd-tools=253.r63408.600362aa11
+	provides = udev=253.r63408.600362aa11
+	provides = systemd=253.r63408.600362aa11
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -178,7 +178,7 @@ pkgname = systemd-libs-git
 	provides = libsystemd
 	provides = libsystemd.so
 	provides = libudev.so
-	provides = systemd-libs=253.r62988.2208d96623
+	provides = systemd-libs=253.r63408.600362aa11
 	conflicts = libsystemd
 	conflicts = systemd-libs
 	replaces = libsystemd
@@ -189,7 +189,7 @@ pkgname = systemd-resolvconf-git
 	depends = systemd-git
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=253.r62988.2208d96623
+	provides = systemd-resolvconf=253.r63408.600362aa11
 	conflicts = openresolv
 	conflicts = systemd-resolvconf
 
@@ -197,7 +197,7 @@ pkgname = systemd-sysvcompat-git
 	pkgdesc = sysvinit compat for systemd (git version)
 	license = GPL2
 	depends = systemd-git
-	provides = systemd-sysvcompat=253.r62988.2208d96623
+	provides = systemd-sysvcompat=253.r63408.600362aa11
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 
@@ -210,5 +210,5 @@ pkgname = systemd-ukify-git
 	optdepends = python-pillow: Show the size of splash image
 	optdepends = sbsigntools: Sign the embedded kernel
 	provides = ukify
-	provides = systemd-ukify=253.r62988.2208d96623
+	provides = systemd-ukify=253.r63408.600362aa11
 	conflicts = systemd-ukify
diff --git a/PKGBUILD b/PKGBUILD
index c85b9b790c1f..a7c4439576af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,14 @@ pkgname=('systemd-git'
          'systemd-sysvcompat-git'
          'systemd-ukify-git')
 pkgdesc='systemd (git version)'
-pkgver=253.r62988.2208d96623
+pkgver=253.r63408.600362aa11
 pkgrel=1
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
              'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
-             'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
+             'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'python-pyelftools' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
              'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync'
              'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls')
@@ -42,7 +42,7 @@ source=('git+https://github.com/systemd/systemd'
         '30-systemd-update.hook')
 sha512sums=('SKIP'
             '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
-            'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
+            '4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e'
             '12f3c011a0164d28b092722639fff92c663c18b032d421695b0a72dbf123dd0908e3822087766ee922e131c02126f67ba2e1983c5cc244f5c4884dfed8605d00'
             'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
@@ -96,7 +96,7 @@ build() {
     -Dmode=release
 
     -Dbpf-framework=true
-    -Dgnu-efi=true
+    -Dbootloader=true
     -Dima=false
     -Dlibidn2=true
     -Dlz4=true
diff --git a/initcpio-hook-udev b/initcpio-hook-udev
index ea9a11f8ce87..dfa875067ee3 100644
--- a/initcpio-hook-udev
+++ b/initcpio-hook-udev
@@ -3,7 +3,11 @@
 run_earlyhook() {
     kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
     systemd-tmpfiles --prefix=/dev --create --boot
-    /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
+    if [ "${quiet}" = "y" ]; then
+        /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never >/dev/null 2>&1
+    else
+        /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
+    fi
     udevd_running=1
 }