Skip to contentSkip to conversation

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

PATCH New Peter Korsgaard 2 participants 3 messages Apr 4, 2019 – Apr 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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).

---
 package/tpm2-tools/Config.in     | 11 ++---------
 package/tpm2-tools/tpm2-tools.mk |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)
package/tpm2-tools/Config.in +2 -9
index d8660a8f71..35ca63bf64 100644
@@ -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
package/tpm2-tools/tpm2-tools.mk +1 -1
index 381873a8f9..9e50170297 100644
@@ -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
Signature · 1 line
2.11.0
#1 lore raw

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

Quoted 11 lines · On Thu, 4 Apr 2019 21:00:28 +0200 Peter Korsgaard <[email protected]> wrote:

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).

---
 package/tpm2-tools/Config.in     | 11 ++---------
 package/tpm2-tools/tpm2-tools.mk |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

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

In reply to Peter Korsgaard
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

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).

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard