* [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency
@ 2022-01-01 22:38 Erik Larsson
2022-01-01 22:38 ` [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 Erik Larsson
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Erik Larsson @ 2022-01-01 22:38 UTC (permalink / raw)
To: buildroot; +Cc: Erik Larsson
The last reference of uriparser was removed in:
https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e
Signed-off-by: Erik Larsson <who+buildroot@cnackers.org>
---
package/tpm2-tss/tpm2-tss.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk
index 71aa3feb96..060883c377 100644
--- a/package/tpm2-tss/tpm2-tss.mk
+++ b/package/tpm2-tss/tpm2-tss.mk
@@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE
TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project
TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack
TPM2_TSS_INSTALL_STAGING = YES
-TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf
+TPM2_TSS_DEPENDENCIES = openssl host-pkgconf
# 0001-configure-Only-use-CXX-when-fuzzing.patch
TPM2_TSS_AUTORECONF = YES
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 2022-01-01 22:38 [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Erik Larsson @ 2022-01-01 22:38 ` Erik Larsson 2022-01-02 4:04 ` Baruch Siach via buildroot 2022-01-02 21:25 ` Erik Larsson 2022-01-01 22:39 ` [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools Erik Larsson ` (2 subsequent siblings) 3 siblings, 2 replies; 13+ messages in thread From: Erik Larsson @ 2022-01-01 22:38 UTC (permalink / raw) To: buildroot; +Cc: Erik Larsson Depedency on libuuid was removed in: https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> --- .../0001-configure-make-build-gnu99.patch | 30 ------------------- package/tpm2-tools/Config.in | 2 -- package/tpm2-tools/tpm2-tools.hash | 2 +- package/tpm2-tools/tpm2-tools.mk | 4 +-- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch deleted file mode 100644 index 37ca6c5873..0000000000 --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 -From: William Roberts <william.c.roberts@intel.com> -Date: Mon, 8 Feb 2021 11:57:28 -0600 -Subject: [PATCH] configure: make build gnu99 - -Signed-off-by: William Roberts <william.c.roberts@intel.com> - -[Retrieved from: -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c -and updated to set gnu99 instead of c99 as done by -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index dc15b5595..25039a0d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ - # -D_GNU_SOURCE is required for execvpe() in options.c - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) - -+# Enable gnu99 mode, since we use some of these features. -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) -+ - # Best attempt compiler options that are on newer versions of GCC that - # we can't widely enforce without killing other peoples builds. - # Works with gcc only. Needs to be disabled on BSD and clang diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 3be947648f..1a6698570a 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_TPM2_TSS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index bfb7e9b220..f50a896363 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 41f5bcf201..df5fbbfff4 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,13 +4,13 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 4.3.2 +TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project TPM2_TOOLS_SELINUX_MODULES = tpm2 -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf # We're patching configure.ac TPM2_TOOLS_AUTORECONF = YES -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 2022-01-01 22:38 ` [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 Erik Larsson @ 2022-01-02 4:04 ` Baruch Siach via buildroot 2022-01-02 21:25 ` Erik Larsson 1 sibling, 0 replies; 13+ messages in thread From: Baruch Siach via buildroot @ 2022-01-02 4:04 UTC (permalink / raw) To: Erik Larsson; +Cc: buildroot Hi Erik, On Sat, Jan 01 2022, Erik Larsson wrote: > Depedency on libuuid was removed in: > https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd > > Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 > > Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> > --- > .../0001-configure-make-build-gnu99.patch | 30 ------------------- > package/tpm2-tools/Config.in | 2 -- > package/tpm2-tools/tpm2-tools.hash | 2 +- > package/tpm2-tools/tpm2-tools.mk | 4 +-- > 4 files changed, 3 insertions(+), 35 deletions(-) > delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch > > diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch > deleted file mode 100644 > index 37ca6c5873..0000000000 > --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 > -From: William Roberts <william.c.roberts@intel.com> > -Date: Mon, 8 Feb 2021 11:57:28 -0600 > -Subject: [PATCH] configure: make build gnu99 > - > -Signed-off-by: William Roberts <william.c.roberts@intel.com> > - > -[Retrieved from: > -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c > -and updated to set gnu99 instead of c99 as done by > -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > ---- > - configure.ac | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/configure.ac b/configure.ac > -index dc15b5595..25039a0d9 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ > - # -D_GNU_SOURCE is required for execvpe() in options.c > - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) > - > -+# Enable gnu99 mode, since we use some of these features. > -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) > -+ > - # Best attempt compiler options that are on newer versions of GCC that > - # we can't widely enforce without killing other peoples builds. > - # Works with gcc only. Needs to be disabled on BSD and clang > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 3be947648f..1a6698570a 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS > select BR2_PACKAGE_LIBCURL > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_TPM2_TSS > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBUUID > help > TPM (Trusted Platform Module) 2.0 CLI tools based on system > API of TPM2-TSS. These tools can be used to manage keys, > diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash > index bfb7e9b220..f50a896363 100644 > --- a/package/tpm2-tools/tpm2-tools.hash > +++ b/package/tpm2-tools/tpm2-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz > +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz > sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index 41f5bcf201..df5fbbfff4 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -4,13 +4,13 @@ > # > ################################################################################ > > -TPM2_TOOLS_VERSION = 4.3.2 > +TPM2_TOOLS_VERSION = 5.2 > TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) > TPM2_TOOLS_LICENSE = BSD-3-Clause > TPM2_TOOLS_LICENSE_FILES = doc/LICENSE > TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project > TPM2_TOOLS_SELINUX_MODULES = tpm2 > -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux > +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf > # We're patching configure.ac > TPM2_TOOLS_AUTORECONF = YES You can also remove this AUTORECONF since you remove the configure.ac patch. baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 2022-01-01 22:38 ` [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 Erik Larsson 2022-01-02 4:04 ` Baruch Siach via buildroot @ 2022-01-02 21:25 ` Erik Larsson 2022-01-04 17:51 ` Arnout Vandecappelle 1 sibling, 1 reply; 13+ messages in thread From: Erik Larsson @ 2022-01-02 21:25 UTC (permalink / raw) To: buildroot; +Cc: Erik Larsson Depedency on libuuid was removed in: https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> --- .../0001-configure-make-build-gnu99.patch | 30 ------------------- package/tpm2-tools/Config.in | 2 -- package/tpm2-tools/tpm2-tools.hash | 2 +- package/tpm2-tools/tpm2-tools.mk | 6 ++-- 4 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch deleted file mode 100644 index 37ca6c5873..0000000000 --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 -From: William Roberts <william.c.roberts@intel.com> -Date: Mon, 8 Feb 2021 11:57:28 -0600 -Subject: [PATCH] configure: make build gnu99 - -Signed-off-by: William Roberts <william.c.roberts@intel.com> - -[Retrieved from: -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c -and updated to set gnu99 instead of c99 as done by -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index dc15b5595..25039a0d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ - # -D_GNU_SOURCE is required for execvpe() in options.c - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) - -+# Enable gnu99 mode, since we use some of these features. -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) -+ - # Best attempt compiler options that are on newer versions of GCC that - # we can't widely enforce without killing other peoples builds. - # Works with gcc only. Needs to be disabled on BSD and clang diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 3be947648f..1a6698570a 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_TPM2_TSS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index bfb7e9b220..f50a896363 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 41f5bcf201..8675344805 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,15 +4,13 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 4.3.2 +TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project TPM2_TOOLS_SELINUX_MODULES = tpm2 -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux -# We're patching configure.ac -TPM2_TOOLS_AUTORECONF = YES +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf # -fstack-protector-all and FORTIFY_SOURCE=2 is used by # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 2022-01-02 21:25 ` Erik Larsson @ 2022-01-04 17:51 ` Arnout Vandecappelle 0 siblings, 0 replies; 13+ messages in thread From: Arnout Vandecappelle @ 2022-01-04 17:51 UTC (permalink / raw) To: Erik Larsson, buildroot On 02/01/2022 22:25, Erik Larsson wrote: > Depedency on libuuid was removed in: > https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd > > Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 > > Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> Applied to master, thanks. Regards, Arnout > --- > .../0001-configure-make-build-gnu99.patch | 30 ------------------- > package/tpm2-tools/Config.in | 2 -- > package/tpm2-tools/tpm2-tools.hash | 2 +- > package/tpm2-tools/tpm2-tools.mk | 6 ++-- > 4 files changed, 3 insertions(+), 37 deletions(-) > delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch > > diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch > deleted file mode 100644 > index 37ca6c5873..0000000000 > --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 > -From: William Roberts <william.c.roberts@intel.com> > -Date: Mon, 8 Feb 2021 11:57:28 -0600 > -Subject: [PATCH] configure: make build gnu99 > - > -Signed-off-by: William Roberts <william.c.roberts@intel.com> > - > -[Retrieved from: > -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c > -and updated to set gnu99 instead of c99 as done by > -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > ---- > - configure.ac | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/configure.ac b/configure.ac > -index dc15b5595..25039a0d9 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ > - # -D_GNU_SOURCE is required for execvpe() in options.c > - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) > - > -+# Enable gnu99 mode, since we use some of these features. > -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) > -+ > - # Best attempt compiler options that are on newer versions of GCC that > - # we can't widely enforce without killing other peoples builds. > - # Works with gcc only. Needs to be disabled on BSD and clang > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 3be947648f..1a6698570a 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS > select BR2_PACKAGE_LIBCURL > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_TPM2_TSS > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBUUID > help > TPM (Trusted Platform Module) 2.0 CLI tools based on system > API of TPM2-TSS. These tools can be used to manage keys, > diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash > index bfb7e9b220..f50a896363 100644 > --- a/package/tpm2-tools/tpm2-tools.hash > +++ b/package/tpm2-tools/tpm2-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz > +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz > sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index 41f5bcf201..8675344805 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -4,15 +4,13 @@ > # > ################################################################################ > > -TPM2_TOOLS_VERSION = 4.3.2 > +TPM2_TOOLS_VERSION = 5.2 > TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) > TPM2_TOOLS_LICENSE = BSD-3-Clause > TPM2_TOOLS_LICENSE_FILES = doc/LICENSE > TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project > TPM2_TOOLS_SELINUX_MODULES = tpm2 > -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux > -# We're patching configure.ac > -TPM2_TOOLS_AUTORECONF = YES > +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf > > # -fstack-protector-all and FORTIFY_SOURCE=2 is used by > # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools 2022-01-01 22:38 [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Erik Larsson 2022-01-01 22:38 ` [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 Erik Larsson @ 2022-01-01 22:39 ` Erik Larsson 2022-01-04 17:52 ` Arnout Vandecappelle ` (2 more replies) 2022-01-04 17:51 ` [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Arnout Vandecappelle 2022-01-26 20:03 ` Peter Korsgaard 3 siblings, 3 replies; 13+ messages in thread From: Erik Larsson @ 2022-01-01 22:39 UTC (permalink / raw) To: buildroot; +Cc: Erik Larsson Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> --- package/tpm2-tools/Config.in | 11 +++++++++++ package/tpm2-tools/tpm2-tools.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 1a6698570a..cb3eb2b0a5 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS https://github.com/tpm2-software/tpm2-tools +if BR2_PACKAGE_TPM2_TOOLS + +config BR2_PACKAGE_TPM2_TOOLS_FAPI + bool "tpm2-tools fapi support" + select BR2_PACKAGE_TPM2_TSS_FAPI + help + This option enables Feature API (FAPI) support in tpm2-tools. + The FAPI tools are prefixed with tss2_. + +endif + comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index df5fbbfff4..6894be195f 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening # do not build man pages TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) +TPM2_TOOLS_CONF_OPTS += --enable-fapi +else +TPM2_TOOLS_CONF_OPTS += --disable-fapi +endif + $(eval $(autotools-package)) -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools 2022-01-01 22:39 ` [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools Erik Larsson @ 2022-01-04 17:52 ` Arnout Vandecappelle 2022-01-05 0:12 ` Erik Larsson 2022-01-04 17:54 ` Arnout Vandecappelle 2022-07-23 12:50 ` Thomas Petazzoni via buildroot 2 siblings, 1 reply; 13+ messages in thread From: Arnout Vandecappelle @ 2022-01-04 17:52 UTC (permalink / raw) To: Erik Larsson, buildroot On 01/01/2022 23:39, Erik Larsson wrote: > Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> > --- > package/tpm2-tools/Config.in | 11 +++++++++++ > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > 2 files changed, 17 insertions(+) > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 1a6698570a..cb3eb2b0a5 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > https://github.com/tpm2-software/tpm2-tools > > +if BR2_PACKAGE_TPM2_TOOLS > + > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > + bool "tpm2-tools fapi support" > + select BR2_PACKAGE_TPM2_TSS_FAPI > + help > + This option enables Feature API (FAPI) support in tpm2-tools. > + The FAPI tools are prefixed with tss2_. > + > +endif > + > comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index df5fbbfff4..6894be195f 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening > # do not build man pages > TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) Does this optoin make a big difference in size? If not, we'd normally make it an automatic option, i.e. ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) (and remove the Config.in option). Regards, Arnout > +TPM2_TOOLS_CONF_OPTS += --enable-fapi > +else > +TPM2_TOOLS_CONF_OPTS += --disable-fapi > +endif > + > $(eval $(autotools-package)) > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools 2022-01-04 17:52 ` Arnout Vandecappelle @ 2022-01-05 0:12 ` Erik Larsson 0 siblings, 0 replies; 13+ messages in thread From: Erik Larsson @ 2022-01-05 0:12 UTC (permalink / raw) To: Arnout Vandecappelle, buildroot On Tue, 2022-01-04 at 18:52 +0100, Arnout Vandecappelle wrote: > > On 01/01/2022 23:39, Erik Larsson wrote: > > Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> > > --- > > package/tpm2-tools/Config.in | 11 +++++++++++ > > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > > 2 files changed, 17 insertions(+) > > > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > > index 1a6698570a..cb3eb2b0a5 100644 > > --- a/package/tpm2-tools/Config.in > > +++ b/package/tpm2-tools/Config.in > > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > > > https://github.com/tpm2-software/tpm2-tools > > > > +if BR2_PACKAGE_TPM2_TOOLS > > + > > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > > + bool "tpm2-tools fapi support" > > + select BR2_PACKAGE_TPM2_TSS_FAPI > > + help > > + This option enables Feature API (FAPI) support in tpm2-tools. > > + The FAPI tools are prefixed with tss2_. > > + > > +endif > > + > > comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" > > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > > !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > > index df5fbbfff4..6894be195f 100644 > > --- a/package/tpm2-tools/tpm2-tools.mk > > +++ b/package/tpm2-tools/tpm2-tools.mk > > @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening > > # do not build man pages > > TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' > > > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) > > Does this optoin make a big difference in size? If not, we'd normally make it > an automatic option, i.e. > > ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) > > (and remove the Config.in option). The size difference is minimal (about 100K). The FAPI tools are enabled automatically if tss2-fapi is available, so I think this patch can be skipped in that case. /Erik > > Regards, > Arnout > > > +TPM2_TOOLS_CONF_OPTS += --enable-fapi > > +else > > +TPM2_TOOLS_CONF_OPTS += --disable-fapi > > +endif > > + > > $(eval $(autotools-package)) > > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools 2022-01-01 22:39 ` [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools Erik Larsson 2022-01-04 17:52 ` Arnout Vandecappelle @ 2022-01-04 17:54 ` Arnout Vandecappelle 2022-07-23 12:50 ` Thomas Petazzoni via buildroot 2022-07-23 12:50 ` Thomas Petazzoni via buildroot 2 siblings, 1 reply; 13+ messages in thread From: Arnout Vandecappelle @ 2022-01-04 17:54 UTC (permalink / raw) To: Erik Larsson, buildroot On 01/01/2022 23:39, Erik Larsson wrote: > Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> > --- > package/tpm2-tools/Config.in | 11 +++++++++++ > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > 2 files changed, 17 insertions(+) > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 1a6698570a..cb3eb2b0a5 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > https://github.com/tpm2-software/tpm2-tools > > +if BR2_PACKAGE_TPM2_TOOLS > + > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > + bool "tpm2-tools fapi support" > + select BR2_PACKAGE_TPM2_TSS_FAPI > + help > + This option enables Feature API (FAPI) support in tpm2-tools. > + The FAPI tools are prefixed with tss2_. > + > +endif > + > comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index df5fbbfff4..6894be195f 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening > # do not build man pages > TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) Does this optoin make a big difference in size? If not, we'd normally make it an automatic option, i.e. ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) (and remove the Config.in option). Regards, Arnout > +TPM2_TOOLS_CONF_OPTS += --enable-fapi > +else > +TPM2_TOOLS_CONF_OPTS += --disable-fapi > +endif > + > $(eval $(autotools-package)) > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools 2022-01-04 17:54 ` Arnout Vandecappelle @ 2022-07-23 12:50 ` Thomas Petazzoni via buildroot 0 siblings, 0 replies; 13+ messages in thread From: Thomas Petazzoni via buildroot @ 2022-07-23 12:50 UTC (permalink / raw) To: Arnout Vandecappelle; +Cc: Erik Larsson, buildroot On Tue, 4 Jan 2022 18:54:41 +0100 Arnout Vandecappelle <arnout@mind.be> wrote: > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) > > Does this optoin make a big difference in size? If not, we'd normally make it > an automatic option, i.e. > > ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) Erik had replied that the difference was 100KB in size, so I thought it was worth having the extra Config.in option, and applied what Erik proposed, with some small changes. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools 2022-01-01 22:39 ` [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools Erik Larsson 2022-01-04 17:52 ` Arnout Vandecappelle 2022-01-04 17:54 ` Arnout Vandecappelle @ 2022-07-23 12:50 ` Thomas Petazzoni via buildroot 2 siblings, 0 replies; 13+ messages in thread From: Thomas Petazzoni via buildroot @ 2022-07-23 12:50 UTC (permalink / raw) To: Erik Larsson; +Cc: buildroot Hello Erik, On Sat, 1 Jan 2022 23:39:00 +0100 Erik Larsson <who+buildroot@cnackers.org> wrote: > Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> > --- > package/tpm2-tools/Config.in | 11 +++++++++++ > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > 2 files changed, 17 insertions(+) > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 1a6698570a..cb3eb2b0a5 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > https://github.com/tpm2-software/tpm2-tools > > +if BR2_PACKAGE_TPM2_TOOLS > + > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > + bool "tpm2-tools fapi support" > + select BR2_PACKAGE_TPM2_TSS_FAPI This was missing a: depends on BR2_TOOLCHAIN_HAS_SYNC_4 which we inherit because we select BR2_PACKAGE_TPM2_TSS_FAPI. Also I changed the prompt to "fapi tools", as repeating "tpm2-tools" is not useful, and the option is more about "fapi tools" than "fapi support" I believe. With these small changes, applied to master. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency 2022-01-01 22:38 [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Erik Larsson 2022-01-01 22:38 ` [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 Erik Larsson 2022-01-01 22:39 ` [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools Erik Larsson @ 2022-01-04 17:51 ` Arnout Vandecappelle 2022-01-26 20:03 ` Peter Korsgaard 3 siblings, 0 replies; 13+ messages in thread From: Arnout Vandecappelle @ 2022-01-04 17:51 UTC (permalink / raw) To: Erik Larsson, buildroot On 01/01/2022 23:38, Erik Larsson wrote: > The last reference of uriparser was removed in: > https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e > > Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> Applied to master, thanks. Regards, Arnout > --- > package/tpm2-tss/tpm2-tss.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk > index 71aa3feb96..060883c377 100644 > --- a/package/tpm2-tss/tpm2-tss.mk > +++ b/package/tpm2-tss/tpm2-tss.mk > @@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE > TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project > TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack > TPM2_TSS_INSTALL_STAGING = YES > -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf > +TPM2_TSS_DEPENDENCIES = openssl host-pkgconf > > # 0001-configure-Only-use-CXX-when-fuzzing.patch > TPM2_TSS_AUTORECONF = YES > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency 2022-01-01 22:38 [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Erik Larsson ` (2 preceding siblings ...) 2022-01-04 17:51 ` [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Arnout Vandecappelle @ 2022-01-26 20:03 ` Peter Korsgaard 3 siblings, 0 replies; 13+ messages in thread From: Peter Korsgaard @ 2022-01-26 20:03 UTC (permalink / raw) To: Erik Larsson; +Cc: buildroot >>>>> "Erik" == Erik Larsson <who+buildroot@cnackers.org> writes: > The last reference of uriparser was removed in: > https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e > Signed-off-by: Erik Larsson <who+buildroot@cnackers.org> Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-07-23 12:51 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-01-01 22:38 [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Erik Larsson 2022-01-01 22:38 ` [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 Erik Larsson 2022-01-02 4:04 ` Baruch Siach via buildroot 2022-01-02 21:25 ` Erik Larsson 2022-01-04 17:51 ` Arnout Vandecappelle 2022-01-01 22:39 ` [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools Erik Larsson 2022-01-04 17:52 ` Arnout Vandecappelle 2022-01-05 0:12 ` Erik Larsson 2022-01-04 17:54 ` Arnout Vandecappelle 2022-07-23 12:50 ` Thomas Petazzoni via buildroot 2022-07-23 12:50 ` Thomas Petazzoni via buildroot 2022-01-04 17:51 ` [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Arnout Vandecappelle 2022-01-26 20:03 ` Peter Korsgaard
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.