diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 172f694..6efae32 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat') # Can be from either systemd or systemd-stable _commit='1e5d2d656420d0e755dbcf72aeba3c3aba54e956' -pkgver=242.0 +pkgver=242.122 pkgrel=1 arch=('x86_64') url='https://www.github.com/systemd/systemd' @@ -68,6 +68,10 @@ _reverts=( ) prepare() { + cd "$pkgbase" + git fetch origin pull/12316/head:12316 + cd .. + cd "$pkgbase-stable" # add upstream repository for cherry-picking @@ -76,6 +80,8 @@ prepare() { # the verified tag is in) git merge --ff-only "${_commit}" + git merge upstream/12316 + local _c for _c in "${_backports[@]}"; do git cherry-pick -n "${_c}"