core/systemd to 253.6-2

This commit is contained in:
Kevin Mihelich 2023-07-11 23:10:15 +00:00
parent 56f168fcf0
commit 93717ae445

View file

@ -14,8 +14,8 @@ pkgname=('systemd'
'systemd-resolvconf'
'systemd-sysvcompat'
'systemd-ukify')
_tag='c2b13f4d9f08d7f4ec113845195ea24bc871e7c0' # git rev-parse v${_tag_name}
_tag_name=253.5
_tag='c017ed867787d09484ba7de75a8f025820596955' # git rev-parse v${_tag_name}
_tag_name=253.6
pkgver="${_tag_name/-/}"
pkgrel=2
arch=('x86_64')
@ -75,8 +75,6 @@ sha512sums=('SKIP'
'825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97')
_backports=(
# Revert "core/service: when resetting PID also reset known flag"
'996b00ede87d6a870332e63974a7d4def3c2f1b0'
)
_reverts=(
@ -88,18 +86,16 @@ prepare() {
# add upstream repository for cherry-picking
git remote add -f upstream ../systemd
local _c
local _c _l
for _c in "${_backports[@]}"; do
if [[ $_c == *..* ]]; then
git log --oneline --reverse "${_c}"
else
git log --oneline -1 "${_c}"
fi
git cherry-pick -n -m1 "${_c}"
if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
git log --oneline "${_l}" "${_c}"
git cherry-pick --mainline 1 --no-commit "${_c}"
done
for _c in "${_reverts[@]}"; do
git log --oneline -1 "${_c}"
git revert -n "${_c}"
if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
git log --oneline "${_l}" "${_c}"
git revert --mainline 1 --no-commit "${_c}"
done
# Replace cdrom/dialout/tape groups with optical/uucp/storage