tpm2-tss: bump version to 3.0.1
PATCH v3 1/1 tpm2-tss: bump version to 3.0.1
- 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 dependencies since tpm2-tss version 2.4.0
--- .../0001-Temporary-fix-for-build-without-C.patch | 13 +++++++------ package/tpm2-tss/Config.in | 4 ++++ package/tpm2-tss/tpm2-tss.hash | 4 ++-- package/tpm2-tss/tpm2-tss.mk | 13 ++----------- 4 files changed, 15 insertions(+), 19 deletions(-)
package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch +7 -6
@@ -1,4 +1,4 @@ -From 158d0bc3a2a7a93090cc12c5b0dd3c27e6f44d61 Mon Sep 17 00:00:00 2001 +From 486f69f141f6677d7862a5bcb546c37781bd4f48 Mon Sep 17 00:00:00 2001 From: Carlos Santos <[email protected]> Date: Mon, 23 Dec 2019 08:02:19 -0300 Subject: [PATCH] Temporary fix for build without C++
@@ -23,22 +23,23 @@ Fixes: 1. https://github.com/tpm2-software/tpm2-tss/commit/60c26e4c4faba6ba12469485653e17092b510840 Signed-off-by: Carlos Santos <[email protected]> +[yairba: rebase on version 3.0.1] --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index cd50451d..a3bd7144 100644 +index a4365886..d87058cf 100755 --- a/configure.ac +++ b/configure.ac -@@ -25,7 +25,6 @@ AC_CANONICAL_HOST - AX_IS_RELEASE(dash-version) +@@ -26,7 +26,6 @@ AX_IS_RELEASE(dash-version) AX_CHECK_ENABLE_DEBUG([info]) --AC_PROG_CXX AC_PROG_CC +-AC_PROG_CXX AC_PROG_LN_S AC_USE_SYSTEM_EXTENSIONS + LT_INIT() -- -2.18.1 +2.20.1
package/tpm2-tss/Config.in +4 -0
@@ -1,6 +1,9 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
@@ -34,4 +37,5 @@ config BR2_PACKAGE_TPM2_TSS https://github.com/tpm2-software/tpm2-tss comment "tpm2-tss needs a toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS
package/tpm2-tss/tpm2-tss.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed: -sha256 9d8c8866829e3ff5e1649ecd82498cb1329e0691139458e53b69e6061febe3d3 tpm2-tss-2.3.3.tar.gz -sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE +sha256 2432533a1cac0f0d15d0337d2f0a23591a50b36aad68ab72412ce694818b7e76 tpm2-tss-3.0.1.tar.gz +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE
package/tpm2-tss/tpm2-tss.mk +2 -11
@@ -4,12 +4,12 @@ # ################################################################################ -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_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_INSTALL_STAGING = YES -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf +TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf json-c libcurl TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc --disable-defaultflags # 0001-configure-Only-use-CXX-when-fuzzing.patch TPM2_TSS_AUTORECONF = YES
@@ -17,13 +17,4 @@ TPM2_TSS_AUTORECONF = YES # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" -# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am -# with content from a fuzz testing run rather than an empty file, -# confusing autoreconf with -# 0001-configure-Only-use-CXX-when-fuzzing.patch -define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM - truncate -s 0 $(@D)/Makefile-fuzz-generated.am -endef -TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM - $(eval $(autotools-package))
--
2.20.1
PATCH v3 1/1 tpm2-tss: bump version to 3.0.1
Hello Yair,
Thanks for your patch.
Quoted 6 lines · On Wed, 14 Oct 2020 15:02:17 +0000 Yair Ben-Avraham via buildroot…
- 0001-Temporary-fix-for-build-without-C.patch,
AC_PROG_CXXline number changed.
- Makefile-fuzz-generated.am now in size zero.
- json-c, libcurl: new dependencies since tpm2-tss version 2.4.0Signed-off-by Yair Ben-Avraham <[email protected]>
Your patch unfortunately does not apply:
$ git pwam 1382206 Applying patch #1382206 using "git am -s" Description: [v3,1/1] tpm2-tss: bump version to 3.0.1 Applying: tpm2-tss: bump version to 3.0.1 error: patch failed: package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch:23 error: package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch: patch does not apply Patch failed at 0001 tpm2-tss: bump version to 3.0.1 hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". 'git am' failed with exit status 128
In addition, the dependencies on json-c and libcurl are not mandatory, they are only needed if FAPI is enabled. It is the case by default, but it's a new feature since tpm2-tss, and I suppose it would make sense to not enable it by default.
Can we make that a sub-option of tpm2-tss ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 1/1 tpm2-tss: bump version to 3.0.1
In reply to Yair Ben-AvrahamHi Yair
Quoted 24 lines · Yair Ben-Avraham via buildroot
- 0001-Temporary-fix-for-build-without-C.patch,
AC_PROG_CXXline number changed.
- Makefile-fuzz-generated.am now in size zero.
- json-c, libcurl: new dependencies since tpm2-tss version 2.4.0Signed-off-by Yair Ben-Avraham <[email protected]>--- .../0001-Temporary-fix-for-build-without-C.patch | 13 +++++++------ package/tpm2-tss/Config.in | 4 ++++ package/tpm2-tss/tpm2-tss.hash | 4 ++-- package/tpm2-tss/tpm2-tss.mk | 13 ++----------- 4 files changed, 15 insertions(+), 19 deletions(-)package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch +1
-1@@ -1,4 +1,4 @@ -From 158d0bc3a2a7a93090cc12c5b0dd3c27e6f44d61 Mon Sep 17 00:00:00 2001 +From 486f69f141f6677d7862a5bcb546c37781bd4f48 Mon Sep 17 00:00:00 2001 From: Carlos Santos <[email protected]> Date: Mon, 23 Dec 2019 08:02:19 -0300 Subject: [PATCH] Temporary fix for build without C++
package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Fixes: · line 26
Quoted 4 lines
package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch +1
-0@@ -23,22 +23,23 @@ Fixes: 1. https://github.com/tpm2-software/tpm2-tss/commit/60c26e4c4faba6ba12469485653e17092b510840 Signed-off-by: Carlos Santos <[email protected]> +[yairba: rebase on version 3.0.1]
You should keep your sign-off like you did in v2. Just add one extra explanation above your sign-off as you do here.
baruch
Quoted 87 lines
package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch +5
-5--- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index cd50451d..a3bd7144 100644 +index a4365886..d87058cf 100755 --- a/configure.ac +++ b/configure.ac -@@ -25,7 +25,6 @@ AC_CANONICAL_HOST - AX_IS_RELEASE(dash-version) +@@ -26,7 +26,6 @@ AX_IS_RELEASE(dash-version) AX_CHECK_ENABLE_DEBUG([info]) --AC_PROG_CXX AC_PROG_CC +-AC_PROG_CXX AC_PROG_LN_S AC_USE_SYSTEM_EXTENSIONS + LT_INIT() -- -2.18.1 +2.20.1package/tpm2-tss/Config.in +4
-0@@ -1,6 +1,9 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL@@ -34,4 +37,5 @@ config BR2_PACKAGE_TPM2_TSS https://github.com/tpm2-software/tpm2-tss comment "tpm2-tss needs a toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBSpackage/tpm2-tss/tpm2-tss.hash +2
-2@@ -1,3 +1,3 @@ # Locally computed: -sha256 9d8c8866829e3ff5e1649ecd82498cb1329e0691139458e53b69e6061febe3d3 tpm2-tss-2.3.3.tar.gz -sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE +sha256 2432533a1cac0f0d15d0337d2f0a23591a50b36aad68ab72412ce694818b7e76 tpm2-tss-3.0.1.tar.gz +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSEpackage/tpm2-tss/tpm2-tss.mk +2
-11@@ -4,12 +4,12 @@ # ################################################################################ -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_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_INSTALL_STAGING = YES -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf +TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf json-c libcurl TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc --disable-defaultflags # 0001-configure-Only-use-CXX-when-fuzzing.patch TPM2_TSS_AUTORECONF = YES@@ -17,13 +17,4 @@ TPM2_TSS_AUTORECONF = YES # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" -# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am -# with content from a fuzz testing run rather than an empty file, -# confusing autoreconf with -# 0001-configure-Only-use-CXX-when-fuzzing.patch -define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM - truncate -s 0 $(@D)/Makefile-fuzz-generated.am -endef -TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM - $(eval $(autotools-package))
Signature · 3 lines
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -