On Thu, Nov 28, 2019 at 03:04:26PM +0100, Bastian Krause wrote: > Signed-off-by: Bastian Krause <[email protected]>
Hmm, this causes a build failure in tpm2-abrmd: .../arm-v7a-linux-gnueabihf/bin/ld: src/.libs/libutil.a(src_libutil_la-resource-manager.o): in function `resource_manager_load_context': platform-arm-hf/build-target/tpm2-abrmd-2.1.1/src/resource-manager.c:609: undefined reference to `Tss2_MU_TPMS_CONTEXT_Unmarshal' .../arm-v7a-linux-gnueabihf/bin/ld: src/.libs/libutil.a(src_libutil_la-resource-manager.o): in function `get_cap_post_process': platform-arm-hf/build-target/tpm2-abrmd-2.1.1/src/resource-manager.c:992: undefined reference to `Tss2_MU_TPMS_CAPABILITY_DATA_Unmarshal' .../arm-v7a-linux-gnueabihf/bin/ld: platform-arm-hf/build-target/tpm2-abrmd-2.1.1/src/resource-manager.c:1025: undefined reference to `Tss2_MU_TPMS_CAPABILITY_DATA_Marshal' .../arm-v7a-linux-gnueabihf/bin/ld: src/.libs/libutil.a(src_libutil_la-session-entry.o): in function `get_handle': platform-arm-hf/build-target/tpm2-abrmd-2.1.1/src/session-entry.c:202: undefined reference to `Tss2_MU_TPM2_HANDLE_Unmarshal' .../arm-v7a-linux-gnueabihf/bin/ld: src/.libs/libutil.a(src_libutil_la-tpm2-command.o): in function `tpm2_command_new_context_save': platform-arm-hf/build-target/tpm2-abrmd-2.1.1/src/tpm2-command.c:291: undefined reference to `Tss2_MU_TPM2_HANDLE_Marshal' .../arm-v7a-linux-gnueabihf/bin/ld: src/.libs/libutil.a(src_libutil_la-tpm2-header.o): in function `tpm2_header_init': platform-arm-hf/build-target/tpm2-abrmd-2.1.1/src/tpm2-header.c:119: undefined reference to `Tss2_MU_TPM2_ST_Marshal' .../arm-v7a-linux-gnueabihf/bin/ld: platform-arm-hf/build-target/tpm2-abrmd-2.1.1/src/tpm2-header.c:125: undefined reference to `Tss2_MU_UINT32_Marshal' .../arm-v7a-linux-gnueabihf/bin/ld: platform-arm-hf/build-target/tpm2-abrmd-2.1.1/src/tpm2-header.c:131: undefined reference to `Tss2_MU_UINT32_Marshal' .../arm-v7a-linux-gnueabihf/bin/ld: src/.libs/libutil.a(src_libutil_la-tpm2-response.o): in function `tpm2_response_new_context_load': platform-arm-hf/build-target/tpm2-abrmd-2.1.1/src/tpm2-response.c:241: undefined reference to `Tss2_MU_TPM2_HANDLE_Marshal' collect2: error: ld returned 1 exit status Michael > --- > Changes since (implicit) v1: > - removed libtss2-tcti-default.so symlink > --- > rules/tpm2-tss.make | 17 ++++++++++++++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > > diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make > index 4bdaef17e..768c64426 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) > -- > 2.24.0 > > > _______________________________________________ > ptxdist mailing list > [email protected] > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected]
