[ptxdist] [PATCH v2] gnupg: add gpgtar option

[ptxdist] [PATCH v2] gnupg: add gpgtar option

[Jonas Rebmann]

we do need the gpgtar utility so an option to enable it would be helpful.

Signed-off-by: Jonas Rebmann <jre@pengutronix.de>
---
Changes in v2:
- Added the forgotten Signed-off-by
- Link to v1: https://lore.ptxdist.org/ptxdist/20240918-gnupg-gpgtar-v1-1-57ba7f5c9bad@pengutronix.de
---
 rules/gnupg.in   | 4 ++++
 rules/gnupg.make | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/rules/gnupg.in b/rules/gnupg.in
index e515be093..e66ed0d40 100644
--- a/rules/gnupg.in
+++ b/rules/gnupg.in
@@ -31,6 +31,10 @@ config GNUPG_GPGV
 	bool
 	prompt "Install gpgv2"
 
+config GNUPG_GPGTAR
+	bool
+	prompt "Install gpgtar"
+
 config GNUPG_GPG_AGENT
 	bool
 	prompt "Install gpg-agent"
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 18761ba60..efd9eddd2 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -47,7 +47,7 @@ GNUPG_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-keyboxd \
 	--disable-tpm2d \
 	--disable-doc \
-	--disable-gpgtar \
+	--$(call ptx/endis, PTXCONF_GNUPG_GPGTAR)-gpgtar \
 	--disable-wks-tools \
 	--disable-gpg-is-gpg2 \
 	--$(call ptx/endis, PTXCONF_GLOBAL_SELINUX)-selinux-support \
@@ -125,6 +125,9 @@ endif
 ifdef PTXCONF_GNUPG_GPG_AGENT
 	@$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpg-agent)
 endif
+ifdef PTXCONF_GNUPG_GPGTAR
+	@$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpgtar)
+endif
 
 	@$(call install_finish, gnupg)
 

---
base-commit: 8de6ce90bc9c95e1d6d319dad00f9c8503168b93
change-id: 20240918-gnupg-gpgtar-7520316c12b4

Best regards,
-- 
Jonas Rebmann <jre@pengutronix.de>

Re: [ptxdist] [APPLIED] gnupg: add gpgtar option

[Michael Olbrich]

Thanks, applied as ef48ae5c83e2fccb3217f68ae50ea98fb2734e14.

Michael

[sent from post-receive hook]

On Thu, 26 Sep 2024 15:18:54 +0200, Jonas Rebmann <jre@pengutronix.de> wrote:
> we do need the gpgtar utility so an option to enable it would be helpful.
> 
> Signed-off-by: Jonas Rebmann <jre@pengutronix.de>
> Message-Id: <20240918-gnupg-gpgtar-v2-1-337e7622a0b5@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gnupg.in b/rules/gnupg.in
> index e515be093e20..e66ed0d40a62 100644
> --- a/rules/gnupg.in
> +++ b/rules/gnupg.in
> @@ -31,6 +31,10 @@ config GNUPG_GPGV
>  	bool
>  	prompt "Install gpgv2"
>  
> +config GNUPG_GPGTAR
> +	bool
> +	prompt "Install gpgtar"
> +
>  config GNUPG_GPG_AGENT
>  	bool
>  	prompt "Install gpg-agent"
> diff --git a/rules/gnupg.make b/rules/gnupg.make
> index 18761ba60904..efd9eddd2a42 100644
> --- a/rules/gnupg.make
> +++ b/rules/gnupg.make
> @@ -47,7 +47,7 @@ GNUPG_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
>  	--disable-keyboxd \
>  	--disable-tpm2d \
>  	--disable-doc \
> -	--disable-gpgtar \
> +	--$(call ptx/endis, PTXCONF_GNUPG_GPGTAR)-gpgtar \
>  	--disable-wks-tools \
>  	--disable-gpg-is-gpg2 \
>  	--$(call ptx/endis, PTXCONF_GLOBAL_SELINUX)-selinux-support \
> @@ -125,6 +125,9 @@ endif
>  ifdef PTXCONF_GNUPG_GPG_AGENT
>  	@$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpg-agent)
>  endif
> +ifdef PTXCONF_GNUPG_GPGTAR
> +	@$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpgtar)
> +endif
>  
>  	@$(call install_finish, gnupg)
>