v3.1.4 was actually BSD-2-Clause licensed. v4.1 is now BSD-3-Clause, so
only fix the md5 sum.

See: https://github.com/tpm2-software/tpm2-tools/issues/1478

Signed-off-by: Bastian Krause <[email protected]>
---
No changes since v2.
---
 rules/tpm2-tools.make | 73 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 61 insertions(+), 12 deletions(-)

diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make
index e7fb757ec..9fbb0cbc7 100644
--- a/rules/tpm2-tools.make
+++ b/rules/tpm2-tools.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools
 #
 # Paths and names
 #
-TPM2_TOOLS_VERSION             := 3.1.4
-TPM2_TOOLS_MD5                 := 61b4a382d24c950148a3f5fe41ac2306
+TPM2_TOOLS_VERSION             := 4.1
+TPM2_TOOLS_MD5                 := aecec22668233776922909f2ebf55e65
 TPM2_TOOLS                     := tpm2-tools-$(TPM2_TOOLS_VERSION)
 TPM2_TOOLS_SUFFIX              := tar.gz
 TPM2_TOOLS_URL                 := 
https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX)
 TPM2_TOOLS_SOURCE              := $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX)
 TPM2_TOOLS_DIR                 := $(BUILDDIR)/$(TPM2_TOOLS)
 TPM2_TOOLS_LICENSE             := BSD-3-Clause
-TPM2_TOOLS_LICENSE_FILES       := 
file://LICENSE;md5=91b7c548d73ea16537799e8060cea819
+TPM2_TOOLS_LICENSE_FILES       := 
file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -34,10 +34,12 @@ TPM2_TOOLS_LICENSE_FILES    := 
file://LICENSE;md5=91b7c548d73ea16537799e8060cea819
 TPM2_TOOLS_CONF_TOOL   := autoconf
 TPM2_TOOLS_CONF_OPT    := \
        $(CROSS_AUTOCONF_USR) \
+       --enable-debug=info \
        --disable-code-coverage \
        --disable-unit \
        --enable-hardening \
-       --without-gcov
+       --without-gcov \
+       --without-bashcompdir
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -46,41 +48,88 @@ TPM2_TOOLS_CONF_OPT := \
 TPM2_TOOLS_PROGS := \
        tpm2_activatecredential \
        tpm2_certify \
+       tpm2_certifycreation \
+       tpm2_changeauth \
+       tpm2_changeeps \
+       tpm2_changepps \
+       tpm2_checkquote \
+       tpm2_clear \
+       tpm2_clearcontrol \
+       tpm2_clockrateadjust \
        tpm2_create \
+       tpm2_createak \
+       tpm2_createek \
        tpm2_createpolicy \
        tpm2_createprimary \
        tpm2_dictionarylockout \
+       tpm2_duplicate \
        tpm2_encryptdecrypt \
        tpm2_evictcontrol \
+       tpm2_flushcontext \
        tpm2_getcap \
-       tpm2_getmanufec \
-       tpm2_getpubak \
-       tpm2_getpubek \
+       tpm2_getekcertificate \
        tpm2_getrandom \
+       tpm2_gettestresult \
+       tpm2_gettime \
        tpm2_hash \
+       tpm2_hierarchycontrol \
        tpm2_hmac \
-       tpm2_listpersistent \
+       tpm2_import \
+       tpm2_incrementalselftest \
        tpm2_load \
        tpm2_loadexternal \
        tpm2_makecredential \
+       tpm2_nvcertify \
        tpm2_nvdefine \
-       tpm2_nvlist \
+       tpm2_nvextend \
+       tpm2_nvincrement \
        tpm2_nvread \
        tpm2_nvreadlock \
-       tpm2_nvrelease \
+       tpm2_nvreadpublic \
+       tpm2_nvsetbits \
+       tpm2_nvundefine \
        tpm2_nvwrite \
+       tpm2_nvwritelock \
+       tpm2_pcrallocate \
        tpm2_pcrevent \
        tpm2_pcrextend \
-       tpm2_pcrlist \
+       tpm2_pcrread \
+       tpm2_pcrreset \
+       tpm2_policyauthorize \
+       tpm2_policyauthorizenv \
+       tpm2_policyauthvalue \
+       tpm2_policycommandcode \
+       tpm2_policycountertimer \
+       tpm2_policyduplicationselect \
+       tpm2_policylocality \
+       tpm2_policynamehash \
+       tpm2_policynv \
+       tpm2_policynvwritten \
+       tpm2_policyor \
+       tpm2_policypassword \
+       tpm2_policypcr \
+       tpm2_policyrestart \
+       tpm2_policysecret \
+       tpm2_policysigned \
+       tpm2_policytemplate \
+       tpm2_policyticket \
+       tpm2_print \
        tpm2_quote \
        tpm2_rc_decode \
+       tpm2_readclock \
        tpm2_readpublic \
        tpm2_rsadecrypt \
        tpm2_rsaencrypt \
+       tpm2_selftest \
        tpm2_send \
+       tpm2_setclock \
+       tpm2_setprimarypolicy \
+       tpm2_shutdown \
        tpm2_sign \
+       tpm2_startauthsession \
        tpm2_startup \
-       tpm2_takeownership \
+       tpm2_stirrandom \
+       tpm2_testparms \
        tpm2_unseal \
        tpm2_verifysignature
 
-- 
2.24.0


_______________________________________________
ptxdist mailing list
[email protected]

Reply via email to