core/systemd to 248-4

This commit is contained in:
Kevin Mihelich 2021-04-08 13:00:18 +00:00
parent d496ea1b9b
commit 7db4e84b67
2 changed files with 10 additions and 15 deletions

View file

@ -13,7 +13,7 @@ pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
_tag='e13126bd95857eb9344e030edbb4c603aab63884' # git rev-parse v${_tag_name} _tag='e13126bd95857eb9344e030edbb4c603aab63884' # git rev-parse v${_tag_name}
_tag_name=248 _tag_name=248
pkgver="${_tag_name/-/}" pkgver="${_tag_name/-/}"
pkgrel=3 pkgrel=4
arch=('x86_64') arch=('x86_64')
url='https://www.github.com/systemd/systemd' url='https://www.github.com/systemd/systemd'
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@ -54,7 +54,7 @@ sha512sums=('SKIP'
'313f3d6cc3d88f718509007e029213a82d84b196afdadc6ef560580acf70ab480aaecd7622f51726cc1af7d7841c6ec5390f72890b055a54fc74722341395651' '313f3d6cc3d88f718509007e029213a82d84b196afdadc6ef560580acf70ab480aaecd7622f51726cc1af7d7841c6ec5390f72890b055a54fc74722341395651'
'e190abdadffecc8539c25558845c1c5a5c04082f9caa2423df104bb01ca698bd41bcb7692e6aac5cdc2cd035fa2452bfccb1b5a35357a20e8cd57393bc25d18a' 'e190abdadffecc8539c25558845c1c5a5c04082f9caa2423df104bb01ca698bd41bcb7692e6aac5cdc2cd035fa2452bfccb1b5a35357a20e8cd57393bc25d18a'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
'99afbaef608930df97ced89ebfb6ae15e7d737591cb5a2c97d82707ea8cd9f255328e992961307fa7e7a7d0b8dabc56221c8c2bafc099420e8373c632eb64b13' 'f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'

View file

@ -1,27 +1,21 @@
#!/bin/bash #!/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_udev_rule() {
# Add an udev rules file to the initcpio image. Dependencies on binaries # Add an udev rules file to the initcpio image. Dependencies on binaries
# will be discovered and added. # will be discovered and added.
# $1: path to rules file (or name of rules file) # $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 if [[ -z $rules ]]; then
# complain about not found rules # complain about not found rules
return 1 return 1
fi fi
add_file "$rules" add_file "$rules" /usr/lib/udev/rules.d/"${rules##*/}"
while IFS=, read -ra rule; do while IFS=, read -ra rule; do
# skip empty lines, comments # skip empty lines, comments
@ -31,9 +25,10 @@ add_udev_rule() {
IFS=' =' read -r key value <<< "$pair" IFS=' =' read -r key value <<< "$pair"
case $key in case $key in
RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
strip_quotes 'value' # strip quotes
binary=${value//[\"\']/}
# just take the first word as the binary name # just take the first word as the binary name
binary=${value%% *} binary=${binary%% *}
[[ ${binary:0:1} == '$' ]] && continue [[ ${binary:0:1} == '$' ]] && continue
if [[ ${binary:0:1} != '/' ]]; then if [[ ${binary:0:1} != '/' ]]; then
binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")