summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Witschel2022-03-14 22:43:19 +0100
committerJonas Witschel2022-03-14 22:43:19 +0100
commit8b8188509091ceddb60a674e34cf1fd839b3a86b (patch)
treeeed2c0095e74591ecbf96009b72a713d775e5766
parentfd5bc59335bc85b66c37993112d278421784f2ec (diff)
downloadaur-8b8188509091ceddb60a674e34cf1fd839b3a86b.tar.gz
upgpkg: tpm2-pkcs11-git 1.7.0.r54.bedf83a-1: add depends on pytss, use PEP 517
- tpm2_ptool depends on python-tpm2-pytss since upstream pull request https://github.com/tpm2-software/tpm2-pkcs11/pull/760 - Update build process according to the new Python package guidelines.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
2 files changed, 12 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3a17cd92ea7c..e325f6f665bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = tpm2-pkcs11-git
pkgdesc = PKCS#11 interface for Trusted Platform Module 2.0 hardware
- pkgver = 1.7.0.r14.862bdb8
+ pkgver = 1.7.0.r54.bedf83a
pkgrel = 1
url = https://github.com/tpm2-software/tpm2-pkcs11
arch = x86_64
@@ -21,13 +21,17 @@ pkgbase = tpm2-pkcs11-git
makedepends = git
makedepends = autoconf-archive
makedepends = cmocka
+ makedepends = python-build
+ makedepends = python-installer
makedepends = python-setuptools
+ makedepends = python-wheel
depends = libyaml
depends = openssl
depends = python
depends = python-bcrypt
depends = python-cryptography
depends = python-pyasn1-modules
+ depends = python-tpm2-pytss
depends = python-yaml
depends = sqlite
depends = tpm2-tools
diff --git a/PKGBUILD b/PKGBUILD
index 95e8fdf800d5..5b80ecd7b1c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
# Maintainer: Jonas Witschel <diabonas@archlinux.org>
# Contributor: Iwan Timmer <irtimmer@gmail.com>
pkgname=tpm2-pkcs11-git
-pkgver=1.7.0.r14.862bdb8
+pkgver=1.7.0.r54.bedf83a
pkgrel=1
pkgdesc='PKCS#11 interface for Trusted Platform Module 2.0 hardware'
arch=('x86_64')
url='https://github.com/tpm2-software/tpm2-pkcs11'
license=('BSD')
-depends=('libyaml' 'openssl' 'python' 'python-bcrypt' 'python-cryptography' 'python-pyasn1-modules' 'python-yaml' 'sqlite'
- 'tpm2-tools' 'tpm2-tss' 'libtss2-esys.so' 'libtss2-fapi.so' 'libtss2-mu.so' 'libtss2-rc.so' 'libtss2-tctildr.so')
-makedepends=('git' 'autoconf-archive' 'cmocka' 'python-setuptools')
+depends=('libyaml' 'openssl' 'python' 'python-bcrypt' 'python-cryptography' 'python-pyasn1-modules'
+ 'python-tpm2-pytss' 'python-yaml' 'sqlite' 'tpm2-tools' 'tpm2-tss'
+ 'libtss2-esys.so' 'libtss2-fapi.so' 'libtss2-mu.so' 'libtss2-rc.so' 'libtss2-tctildr.so')
+makedepends=('git' 'autoconf-archive' 'cmocka' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel')
checkdepends=('expect' 'iproute2' 'java-hamcrest' 'junit' 'libp11' 'opensc' 'openssh'
'python-python-pkcs11' 'swtpm' 'tpm2-abrmd' 'tpm2-tss-engine' 'wget' 'xxd')
source=("git+$url.git")
@@ -31,7 +32,7 @@ build() {
./configure --prefix=/usr --enable-unit $( ((CHECKFUNC)) && echo --enable-integration)
make
cd tools
- python setup.py build
+ python -m build --wheel --no-isolation
}
check() {
@@ -44,5 +45,5 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
cd tools
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+ python -m installer --destdir="$pkgdir" dist/*.whl
}