package/tpm2-tools: drop unused dbus / libglib2 dependencies

tpm2-tools does not need dbus or libglib2, so remove them and the
corresponding toolchain dependencies.

The confusion may have come from the upstream travis configuration, which
also builds tpm2-abrmd (which uses dbus+libglib2).

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Peter Korsgaard 2019-04-04 21:00:28 +02:00 committed by Thomas Petazzoni
parent 2bce7d7de9
commit f63a58c350
2 changed files with 3 additions and 10 deletions

View File

@ -1,12 +1,7 @@
config BR2_PACKAGE_TPM2_TOOLS
bool "tpm2-tools"
depends on BR2_USE_MMU # dbus, libglib
depends on BR2_USE_WCHAR # libglib -> gettext
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib
depends on !BR2_STATIC_LIBS # tpm2-tss
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_TPM2_TSS
help
@ -23,7 +18,5 @@ config BR2_PACKAGE_TPM2_TOOLS
https://github.com/tpm2-software/tpm2-tools
comment "tpm2-tools needs a toolchain w/ dynamic library, wchar, threads"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
BR2_STATIC_LIBS
comment "tpm2-tools needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS

View File

@ -8,7 +8,7 @@ TPM2_TOOLS_VERSION = 3.1.4
TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)
TPM2_TOOLS_LICENSE = BSD-2-Clause
TPM2_TOOLS_LICENSE_FILES = LICENSE
TPM2_TOOLS_DEPENDENCIES = dbus libcurl libglib2 openssl tpm2-tss host-pkgconf
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