[ptxdist] [PATCH 1/2] tpm2-abrmd: make installation of libtss2-tcti-tabrmd.so.0 conditional

[ptxdist] [PATCH 1/2] tpm2-abrmd: make installation of libtss2-tcti-tabrmd.so.0 conditional

[Uwe Kleine-König]

Not all users of tpm2-abrmd make use of the library, so introduce a
config symbol to make it possible to not install it.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/tpm2-abrmd.in   | 7 +++++++
 rules/tpm2-abrmd.make | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/rules/tpm2-abrmd.in b/rules/tpm2-abrmd.in
index 1ab0a6a7fe0e..61bba8a02030 100644
--- a/rules/tpm2-abrmd.in
+++ b/rules/tpm2-abrmd.in
@@ -16,3 +16,10 @@ config TPM2_ABRMD
 	  (TAB) & Resource Manager (RM) spec from the TCG. The daemon
 	  (tpm2-abrmd) is implemented using Glib and the GObject
 	  system.
+
+if TPM2_ABRMD
+
+config TPM2_ABRMD_LIBTSS2_TCTI_TABRMD
+	bool "install libtss2-tcti-tabrmd.so.0"
+
+endif
diff --git a/rules/tpm2-abrmd.make b/rules/tpm2-abrmd.make
index bbf3344126f7..edc1fcfc0e6e 100644
--- a/rules/tpm2-abrmd.make
+++ b/rules/tpm2-abrmd.make
@@ -63,7 +63,9 @@ $(STATEDIR)/tpm2-abrmd.targetinstall:
 	@$(call install_fixup, tpm2-abrmd,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, tpm2-abrmd,DESCRIPTION,missing)
 
+ifdef PTXCONF_TPM2_ABRMD_LIBTSS2_TCTI_TABRMD
 	@$(call install_lib, tpm2-abrmd, 0, 0, 0644, libtss2-tcti-tabrmd)
+endif
 	@$(call install_copy, tpm2-abrmd, 0, 0, 0755, -, /usr/sbin/tpm2-abrmd)
 
 	@$(call install_alternative, tpm2-abrmd, 0, 0, 0644, \
-- 
2.27.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/2] tpm2-tss: make installation of libtss2-tcti-{device, mssim}.so.0 conditional

[Uwe Kleine-König]

Not all users of tpm2-tss make use of the libraries, so introduce a
config symbol to make it possible to not install them.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/tpm2-tss.in   | 10 ++++++++++
 rules/tpm2-tss.make |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
index dbb31007276b..bf1506da67c4 100644
--- a/rules/tpm2-tss.in
+++ b/rules/tpm2-tss.in
@@ -20,3 +20,13 @@ config TPM2_TSS
 	  This package contains the TSS and TCTI libraries that client
 	  applications will link against when they require accessing
 	  the TPM.
+
+if TPM2_TSS
+
+config TPM2_TSS_LIBTSS2_TCTI_DEVICE
+	bool "install libtss2-tcti-device.so.0"
+
+config TPM2_TSS_LIBTSS2_TCTI_MSSIM
+	bool "install libtss2-tcti-mssim.so.0"
+
+endif
diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
index 768c64426cbb..ed49a7d56c3d 100644
--- a/rules/tpm2-tss.make
+++ b/rules/tpm2-tss.make
@@ -83,8 +83,12 @@ $(STATEDIR)/tpm2-tss.targetinstall:
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-esys)
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-mu)
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys)
+ifdef PTXCONF_TPM2_TSS_LIBTSS2_TCTI_DEVICE
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-device)
+endif
+ifdef PTXCONF_TPM2_TSS_LIBTSS2_TCTI_MSSIM
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-mssim)
+endif
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tctildr)
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-rc)
 
-- 
2.27.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/2] tpm2-tss: make installation of libtss2-tcti-{device, mssim}.so.0 conditional

[Michael Olbrich]

On Tue, Jun 16, 2020 at 12:50:44PM +0200, Uwe Kleine-König wrote:
> Not all users of tpm2-tss make use of the libraries, so introduce a
> config symbol to make it possible to not install them.

Same here.

Michael

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  rules/tpm2-tss.in   | 10 ++++++++++
>  rules/tpm2-tss.make |  4 ++++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
> index dbb31007276b..bf1506da67c4 100644
> --- a/rules/tpm2-tss.in
> +++ b/rules/tpm2-tss.in
> @@ -20,3 +20,13 @@ config TPM2_TSS
>  	  This package contains the TSS and TCTI libraries that client
>  	  applications will link against when they require accessing
>  	  the TPM.
> +
> +if TPM2_TSS
> +
> +config TPM2_TSS_LIBTSS2_TCTI_DEVICE
> +	bool "install libtss2-tcti-device.so.0"
> +
> +config TPM2_TSS_LIBTSS2_TCTI_MSSIM
> +	bool "install libtss2-tcti-mssim.so.0"
> +
> +endif
> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
> index 768c64426cbb..ed49a7d56c3d 100644
> --- a/rules/tpm2-tss.make
> +++ b/rules/tpm2-tss.make
> @@ -83,8 +83,12 @@ $(STATEDIR)/tpm2-tss.targetinstall:
>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-esys)
>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-mu)
>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys)
> +ifdef PTXCONF_TPM2_TSS_LIBTSS2_TCTI_DEVICE
>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-device)
> +endif
> +ifdef PTXCONF_TPM2_TSS_LIBTSS2_TCTI_MSSIM
>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-mssim)
> +endif
>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tctildr)
>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-rc)
>  
> -- 
> 2.27.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

-- 
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
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/2] tpm2-abrmd: make installation of libtss2-tcti-tabrmd.so.0 conditional

[Michael Olbrich]

On Tue, Jun 16, 2020 at 12:50:43PM +0200, Uwe Kleine-König wrote:
> Not all users of tpm2-abrmd make use of the library, so introduce a
> config symbol to make it possible to not install it.

No. I want to avoid additional options unless it avoids a dependency or the
library is quite bit. And I don't think that's the case here.

Michael

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  rules/tpm2-abrmd.in   | 7 +++++++
>  rules/tpm2-abrmd.make | 2 ++
>  2 files changed, 9 insertions(+)
> 
> diff --git a/rules/tpm2-abrmd.in b/rules/tpm2-abrmd.in
> index 1ab0a6a7fe0e..61bba8a02030 100644
> --- a/rules/tpm2-abrmd.in
> +++ b/rules/tpm2-abrmd.in
> @@ -16,3 +16,10 @@ config TPM2_ABRMD
>  	  (TAB) & Resource Manager (RM) spec from the TCG. The daemon
>  	  (tpm2-abrmd) is implemented using Glib and the GObject
>  	  system.
> +
> +if TPM2_ABRMD
> +
> +config TPM2_ABRMD_LIBTSS2_TCTI_TABRMD
> +	bool "install libtss2-tcti-tabrmd.so.0"
> +
> +endif
> diff --git a/rules/tpm2-abrmd.make b/rules/tpm2-abrmd.make
> index bbf3344126f7..edc1fcfc0e6e 100644
> --- a/rules/tpm2-abrmd.make
> +++ b/rules/tpm2-abrmd.make
> @@ -63,7 +63,9 @@ $(STATEDIR)/tpm2-abrmd.targetinstall:
>  	@$(call install_fixup, tpm2-abrmd,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
>  	@$(call install_fixup, tpm2-abrmd,DESCRIPTION,missing)
>  
> +ifdef PTXCONF_TPM2_ABRMD_LIBTSS2_TCTI_TABRMD
>  	@$(call install_lib, tpm2-abrmd, 0, 0, 0644, libtss2-tcti-tabrmd)
> +endif
>  	@$(call install_copy, tpm2-abrmd, 0, 0, 0755, -, /usr/sbin/tpm2-abrmd)
>  
>  	@$(call install_alternative, tpm2-abrmd, 0, 0, 0644, \
> -- 
> 2.27.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

-- 
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
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de