summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Krause <bst@pengutronix.de>2019-11-29 12:51:32 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-12-04 12:07:24 +0100
commit876d1fb5b43120691e5c1dd11199e32336cd0ed8 (patch)
treed6cdf95c68d6988d5ee8da71b034d7c8c61f0727
parent5c377cd4aa3103ebb97177ba50ad3b090b3add87 (diff)
downloadptxdist-876d1fb5b43120691e5c1dd11199e32336cd0ed8.tar.gz
tpm2-tss: version bump 2.2.2 -> 2.3.1
Signed-off-by: Bastian Krause <bst@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/tpm2-tss.make17
1 files changed, 14 insertions, 3 deletions
diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
index 4bdaef1..768c644 100644
--- a/rules/tpm2-tss.make
+++ b/rules/tpm2-tss.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
#
# Paths and names
#
-TPM2_TSS_VERSION := 2.2.2
-TPM2_TSS_MD5 := db341b66daab34cbb4d6a4e5a8745001
+TPM2_TSS_VERSION := 2.3.1
+TPM2_TSS_MD5 := 5744b10e3cef56df5d65b50f51fb3fe9
TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION)
TPM2_TSS_SUFFIX := tar.gz
TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
@@ -34,15 +34,23 @@ TPM2_TSS_LICENSE_FILES := file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da
TPM2_TSS_CONF_TOOL := autoconf
TPM2_TSS_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --enable-debug=info \
--disable-unit \
--enable-esapi \
--disable-tcti-device-async \
--disable-tcti-partial-reads \
--enable-tcti-device \
--enable-tcti-mssim \
+ --disable-tcti-fuzzing \
+ --disable-nodl \
--disable-integration \
- --disable-debug \
+ --disable-valgrind \
+ --disable-valgrind-memcheck \
+ --disable-valgrind-helgrind \
+ --disable-valgrind-drd \
+ --disable-valgrind-sgcheck \
--disable-defaultflags \
+ --disable-weakcrypto \
--disable-doxygen-doc \
--disable-doxygen-dot \
--disable-doxygen-man \
@@ -56,6 +64,7 @@ TPM2_TSS_CONF_OPT := \
--disable-code-coverage \
--with-crypto=ossl \
--with-udevrulesdir=/usr/lib/udev/rules.d \
+ --with-fuzzing=none \
--without-gcov
# ----------------------------------------------------------------------------
@@ -76,6 +85,8 @@ $(STATEDIR)/tpm2-tss.targetinstall:
@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys)
@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-device)
@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-mssim)
+ @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tctildr)
+ @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-rc)
@$(call install_alternative, tpm2-tss, 0, 0, 0644, \
/usr/lib/udev/rules.d/70-tpm-udev.rules)