[arch-commits] Commit in clevis/trunk (PKGBUILD)

[Jonas Witschel]

    Date: Monday, November 16, 2020 @ 19:05:58
  Author: diabonas
Revision: 755527

upgpkg: clevis 15-2: add support for tpm2-tools 5.0

Modified:
  clevis/trunk/PKGBUILD

----------+
 PKGBUILD |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-16 19:05:22 UTC (rev 755526)
+++ PKGBUILD	2020-11-16 19:05:58 UTC (rev 755527)
@@ -1,8 +1,8 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 pkgname=clevis
 pkgver=15
-_commit=6add2e9acbed9b4bcb50dcc60d4c72733bd65d14 # signed commit corresponding to tag "v$pkgver"
-pkgrel=1
+_commit=6add2e9acbed9b4bcb50dcc60d4c72733bd65d14 # git rev-parse "v$pkgver^{}"
+pkgrel=2
 pkgdesc='Automated Encryption Framework'
 arch=('x86_64')
 url='https://github.com/latchset/clevis'
@@ -32,6 +32,12 @@
 	git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+	cd "$pkgname"
+	# Add support for tpm2-tools 5.0
+	git cherry-pick --no-commit ef76951e4486dadf41ca8085e09849466a0c7fd3
+}
+
 build() {
 	cd "$pkgname"
 	meson --prefix=/usr --libexecdir=/usr/lib --buildtype=plain build