diff options
author | Yurii Kolesnykov | 2021-07-15 06:51:50 +0300 |
---|---|---|
committer | Yurii Kolesnykov | 2021-07-15 06:51:50 +0300 |
commit | 589bb695bb8c5ad5396330a1c8dc28f5965a71d9 (patch) | |
tree | bb26993f743a3372c8f785dfa6e0bff1487f8266 | |
parent | 8b6fc89bc74c57f41b143e302f01139d3ce96ef1 (diff) | |
download | aur-589bb695bb8c5ad5396330a1c8dc28f5965a71d9.tar.gz |
sync with testing/systemd
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | initcpio-install-systemd | 23 |
3 files changed, 19 insertions, 24 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-git pkgdesc = systemd (git version) - pkgver = 249.r50.g0de0ba573b + pkgver = 249.r108.g6c39b39aa8 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -66,7 +66,7 @@ pkgbase = systemd-git sha512sums = 10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1 sha512sums = 34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73 - sha512sums = 8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a + sha512sums = f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17 sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 @@ -128,10 +128,10 @@ pkgname = systemd-git optdepends = curl: machinectl pull-tar and pull-raw optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 - provides = systemd=249.r50.g0de0ba573b + provides = systemd=249.r108.g6c39b39aa8 provides = nss-myhostname - provides = systemd-tools=249.r50.g0de0ba573b - provides = udev=249.r50.g0de0ba573b + provides = systemd-tools=249.r108.g6c39b39aa8 + provides = udev=249.r108.g6c39b39aa8 conflicts = systemd conflicts = nss-myhostname conflicts = systemd-tools @@ -166,7 +166,7 @@ pkgname = systemd-libs-git depends = lz4 depends = xz depends = zstd - provides = systemd-libs=249.r50.g0de0ba573b + provides = systemd-libs=249.r108.g6c39b39aa8 provides = libsystemd provides = libsystemd.so provides = libudev.so @@ -178,7 +178,7 @@ pkgname = systemd-resolvconf-git pkgdesc = systemd resolvconf replacement (for use with systemd-resolved, git version) license = LGPL2.1 depends = systemd-git - provides = systemd-resolvconf=249.r50.g0de0ba573b + provides = systemd-resolvconf=249.r108.g6c39b39aa8 provides = openresolv provides = resolvconf conflicts = systemd-resolvconf @@ -188,6 +188,6 @@ pkgname = systemd-sysvcompat-git pkgdesc = sysvinit compat for systemd (git version) license = GPL2 depends = systemd-git - provides = systemd-sysvcompat=249.r50.g0de0ba573b + provides = systemd-sysvcompat=249.r108.g6c39b39aa8 conflicts = systemd-sysvcompat conflicts = sysvinit @@ -8,7 +8,7 @@ _pkgbase=systemd pkgbase=$_pkgbase-git pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git') pkgdesc='systemd (git version)' -pkgver=249.r62.ga814eae728 +pkgver=249.r108.g6c39b39aa8 pkgrel=1 arch=('x86_64') url='https://www.github.com/systemd/systemd' @@ -43,7 +43,7 @@ sha512sums=('SKIP' '10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1' '34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a' + 'f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' diff --git a/initcpio-install-systemd b/initcpio-install-systemd index 18846528cecc..05ccb904fa90 100644 --- a/initcpio-install-systemd +++ b/initcpio-install-systemd @@ -1,27 +1,21 @@ #!/bin/bash -strip_quotes() { - local len=${#1} quotes=$'[\'"]' str=${!1} - - if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then - printf -v "$1" %s "${str:1:-1}" - fi -} - add_udev_rule() { # Add an udev rules file to the initcpio image. Dependencies on binaries # will be discovered and added. # $1: path to rules file (or name of rules file) - local rules= rule= key= value= binary= + local rules="$1" rule= key= value= binary= - rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") + if [[ ${rules:0:1} != '/' ]]; then + rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") + fi if [[ -z $rules ]]; then # complain about not found rules return 1 fi - add_file "$rules" + add_file "$rules" /usr/lib/udev/rules.d/"${rules##*/}" while IFS=, read -ra rule; do # skip empty lines, comments @@ -31,9 +25,10 @@ add_udev_rule() { IFS=' =' read -r key value <<< "$pair" case $key in RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) - strip_quotes 'value' + # strip quotes + binary=${value//[\"\']/} # just take the first word as the binary name - binary=${value%% *} + binary=${binary%% *} [[ ${binary:0:1} == '$' ]] && continue if [[ ${binary:0:1} != '/' ]]; then binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") @@ -174,7 +169,7 @@ build() { echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd" echo 'root:*:::::::' >"$BUILDROOT/etc/shadow" - getent group root audio disk input kmem kvm lp optical render storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group" + getent group root audio disk input kmem kvm lp optical render sgx storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group" add_dir "/etc/modules-load.d" ( |