Skip to contentSkip to conversation

package/tpm2-tools: propagate BR2_PACKAGE_TPM2_TSS_FAPI dependencies

PATCH In review Thomas Petazzoni via buildroot 1 participant 3 messages Aug 8

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/tpm2-tools: propagate BR2_PACKAGE_TPM2_TSS_FAPI dependencies

In commit 5394df6400912efa7da4f97c7ea68a81a9f77c1d ("package/tpm2-tss:
add Mbed-TLS crypto backend support"), a depends on !BR2_PACKAGE_MBEDTLS was added to BR2_PACKAGE_TPM2_TSS_FAPI, but this new dependency was not properly propagated to the reverse dependencies, causing kconfig warnings such as:

WARNING: unmet direct dependencies detected for BR2_PACKAGE_TPM2_TSS_FAPI
Depends on [n]: BR2_PACKAGE_TPM2_TSS [=y] && BR2_TOOLCHAIN_HAS_SYNC_4 [=y] && !BR2_PACKAGE_MBEDTLS [=y] Selected by [y]:
- BR2_PACKAGE_TPM2_TOOLS_FAPI [=y] && BR2_PACKAGE_TPM2_TOOLS [=y] && BR2_TOOLCHAIN_HAS_SYNC_4 [=y]

This commit properly propagates this new dependency to BR2_PACKAGE_TPM2_TOOLS_FAPI, fixing the kconfig warning.

---
 package/tpm2-tools/Config.in | 5 +++++
 1 file changed, 5 insertions(+)
package/tpm2-tools/Config.in +5 -0
index 0dcf176dfd..abe6aa5689 100644
@@ -26,11 +26,16 @@ if BR2_PACKAGE_TPM2_TOOLS
 config BR2_PACKAGE_TPM2_TOOLS_FAPI
 	bool "fapi tools"
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on !BR2_PACKAGE_MBEDTLS # tss-fapi
 	select BR2_PACKAGE_TPM2_TSS_FAPI
 	help
 	  This option enables Feature API (FAPI) support in
 	  tpm2-tools. The FAPI tools are prefixed with tss2_.
 
+comment "fapi-tools not supported with Mbed TLS backend"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on BR2_PACKAGE_MBEDTLS
+
 endif
 
 comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar"
Signature · 6 lines
2.55.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/tpm2-tss: do not show comment when dependencies are not met

Commit 5394df6400912efa7da4f97c7ea68a81a9f77c1d ("package/tpm2-tss:
add Mbed-TLS crypto backend support") added a dependency to BR2_PACKAGE_TPM2_TSS_FAPI, and a comment about this dependency. However, the comment is shown even if other architecture-related dependencies are not met.

This commit fixes that by only displaying the comment when relevant, i.e when BR2_TOOLCHAIN_HAS_SYNC_4.

---
 package/tpm2-tss/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/tpm2-tss/Config.in +1 -0
index 91337ce48d..f4bd8c3cdb 100644
@@ -56,6 +56,7 @@ config BR2_PACKAGE_TPM2_TSS_FAPI
 	  https://trustedcomputinggroup.org/wp-content/uploads/TSS_JSON_Policy_v0.7_r04_pubrev.pdf
 
 comment "FAPI not supported with Mbed TLS backend"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_PACKAGE_MBEDTLS
 
 endif
Signature · 6 lines
2.55.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Thomas Petazzoni via buildroot
Quoted 13 lines · Thomas Petazzoni via buildroot

In commit 5394df6400912efa7da4f97c7ea68a81a9f77c1d ("package/tpm2-tss:
add Mbed-TLS crypto backend support"), a depends on !BR2_PACKAGE_MBEDTLS was added to BR2_PACKAGE_TPM2_TSS_FAPI, but this new dependency was not properly propagated to the reverse dependencies, causing kconfig warnings such as:

WARNING: unmet direct dependencies detected for BR2_PACKAGE_TPM2_TSS_FAPI
Depends on [n]: BR2_PACKAGE_TPM2_TSS [=y] && BR2_TOOLCHAIN_HAS_SYNC_4
[=y] && !BR2_PACKAGE_MBEDTLS [=y]
Selected by [y]:
- BR2_PACKAGE_TPM2_TOOLS_FAPI [=y] && BR2_PACKAGE_TPM2_TOOLS [=y] &&
BR2_TOOLCHAIN_HAS_SYNC_4 [=y]

Quoted 4 lines

This commit properly propagates this new dependency to BR2_PACKAGE_TPM2_TOOLS_FAPI, fixing the kconfig warning.

Series applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot