[arch-commits] Commit in systemd/trunk (PKGBUILD)
Jan Steffens
heftig at archlinux.org
Wed Mar 7 23:46:18 UTC 2018
Date: Wednesday, March 7, 2018 @ 23:46:17
Author: heftig
Revision: 318015
Run _validate_tag after pkgver()
Modified:
systemd/trunk/PKGBUILD
----------+
PKGBUILD | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-07 23:46:13 UTC (rev 318014)
+++ PKGBUILD 2018-03-07 23:46:17 UTC (rev 318015)
@@ -7,8 +7,6 @@
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
# Can be from either systemd or systemd-stable
_commit='738ab7502afb7663d9aacdd73e79025aa7cd0a9b'
-# Bump this to latest major release for signed tag verification,
-# the commit count is handled by pkgver() function.
pkgver=238.0
pkgrel=1
arch=('x86_64')
@@ -68,9 +66,10 @@
_reverts=(
)
-_validate_tag() {
+_validate_tag() (
local success fingerprint trusted status tag=v${pkgver%.*}
+ cd "$srcdir/$pkgbase-stable"
parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
if (( ! success )); then
@@ -93,18 +92,8 @@
esac
return 0
-}
+)
-pkgver() {
- local version count
-
- cd "$pkgbase-stable"
-
- version="$(git describe --abbrev=0 --tags)"
- count="$(git rev-list --count ${version}..)"
- printf '%s.%s' "${version#v}" "${count}"
-}
-
prepare() {
cd "$pkgbase-stable"
@@ -111,8 +100,6 @@
git remote add -f upstream ../systemd
git checkout "$_commit"
- _validate_tag || return
-
local c
for c in "${_backports[@]}"; do
git cherry-pick -n "$c"
@@ -125,7 +112,19 @@
patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
}
+pkgver() {
+ local version count
+
+ cd "$pkgbase-stable"
+
+ version="$(git describe --abbrev=0 --tags)"
+ count="$(git rev-list --count ${version}..)"
+ printf '%s.%s' "${version#v}" "${count}"
+}
+
build() {
+ _validate_tag || return
+
local timeservers=({0..3}.arch.pool.ntp.org)
local meson_options=(
More information about the arch-commits
mailing list