bslathi19/buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/tpm2-tss: bump version to 3.0.1

Browse Source 
- 0001-Temporary-fix-for-build-without-C.patch, AC_PROG_CXX line
  number changed.
- Makefile-fuzz-generated.am now in size zero.
- json-c, libcurl: new (FAPI) dependencies since tpm2-tss version 2.4.0

Signed-off-by: Yair Ben-Avraham <yairba@protonmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Yair Ben-Avraham
2020-10-15 09:00:13 +00:00
committed by Thomas Petazzoni
parent ee21017891
commit 89f3d90e24
4 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch
View File

@@ -1,4 +1,4 @@
From 158d0bc3a2a7a93090cc12c5b0dd3c27e6f44d61 Mon Sep 17 00:00:00 2001 From 7dc753ad27a8cd14c9b00be94ca89b847cf05ce9 Mon Sep 17 00:00:00 2001
From: Carlos Santos <unixmania@gmail.com> From: Carlos Santos <unixmania@gmail.com>
Date: Mon, 23 Dec 2019 08:02:19 -0300 Date: Mon, 23 Dec 2019 08:02:19 -0300
Subject: [PATCH] Temporary fix for build without C++ Subject: [PATCH] Temporary fix for build without C++
@@ -28,17 +28,17 @@ Signed-off-by: Carlos Santos <unixmania@gmail.com>
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index cd50451d..a3bd7144 100644 index ff59dd7c..3e4028fb 100755
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -25,7 +25,6 @@ AC_CANONICAL_HOST @@ -26,7 +26,6 @@ AX_IS_RELEASE(dash-version)
AX_IS_RELEASE(dash-version)
AX_CHECK_ENABLE_DEBUG([info]) AX_CHECK_ENABLE_DEBUG([info])
-AC_PROG_CXX
AC_PROG_CC AC_PROG_CC
-AC_PROG_CXX
AC_PROG_LN_S AC_PROG_LN_S
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
LT_INIT()
-- --
2.18.1 2.26.2

21
package/tpm2-tss/Config.in
View File

@@ -33,5 +33,26 @@ config BR2_PACKAGE_TPM2_TSS
https://github.com/tpm2-software/tpm2-tss https://github.com/tpm2-software/tpm2-tss
if BR2_PACKAGE_TPM2_TSS
config BR2_PACKAGE_TPM2_TSS_FAPI
bool "fapi support"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
select BR2_PACKAGE_JSON_C
select BR2_PACKAGE_LIBCURL
help
This option allows to enable Feature API (FAPI). Feature
API (FAPI) as described in the "TSS 2.0 Feature API
Specification" along with "TSS 2.0 JSON Data Types and
Policy Language Specification" This API is designed to be
very high-level API, intended to make programming with the
TPM as simple as possible. The API functions are exposed
through a single library: libtss2-fapi.
https://trustedcomputinggroup.org/wp-content/uploads/TSS_FAPI_v0.94_r04_pubrev.pdf
https://trustedcomputinggroup.org/wp-content/uploads/TSS_JSON_Policy_v0.7_r04_pubrev.pdf
endif
comment "tpm2-tss needs a toolchain w/ dynamic library" comment "tpm2-tss needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS depends on BR2_STATIC_LIBS

4
package/tpm2-tss/tpm2-tss.hash
View File

@@ -1,3 +1,3 @@
# Locally computed: # Locally computed:
sha256 9d8c8866829e3ff5e1649ecd82498cb1329e0691139458e53b69e6061febe3d3 tpm2-tss-2.3.3.tar.gz sha256 2432533a1cac0f0d15d0337d2f0a23591a50b36aad68ab72412ce694818b7e76 tpm2-tss-3.0.1.tar.gz
sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE

16
package/tpm2-tss/tpm2-tss.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
TPM2_TSS_VERSION = 2.3.3 TPM2_TSS_VERSION = 3.0.1
TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)
TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE = BSD-2-Clause
TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_LICENSE_FILES = LICENSE
@@ -17,13 +17,11 @@ TPM2_TSS_AUTORECONF = YES
# uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used
TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"
# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y)
# with content from a fuzz testing run rather than an empty file, TPM2_TSS_DEPENDENCIES += json-c libcurl
# confusing autoreconf with TPM2_TSS_CONF_OPTS += --enable-fapi
# 0001-configure-Only-use-CXX-when-fuzzing.patch else
define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM TPM2_TSS_CONF_OPTS += --disable-fapi
truncate -s 0 $(@D)/Makefile-fuzz-generated.am endif
endef
TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
$(eval $(autotools-package)) $(eval $(autotools-package))