From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
From: Andreas Pretzsch <apr@cn-eng.de>
Date: Tue, 17 Mar 2015 22:03:36 +0100
Message-Id: <1426626216-24698-1-git-send-email-apr@cn-eng.de>
Subject: [ptxdist] [PATCH] gnupg: targetinstall: make gpg/gpg2 and gpgv2
	selectable
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>

Add new config options for targetinstall:
  GNUPG_GPG  : Install gpg2 + symlink gpg => gpg2
  GNUPG_GPGV : Install gpgv2

Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
---
Based on a preliminary modification by Philipp Zabel.
Option names might be debatable.
Also "default y" might make sense.
Please adapt or come back to me for a V2.

 rules/gnupg.in   | 12 ++++++++++++
 rules/gnupg.make |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/rules/gnupg.in b/rules/gnupg.in
index 1f6c150..9539ff8 100644
--- a/rules/gnupg.in
+++ b/rules/gnupg.in
@@ -15,3 +15,15 @@ config GNUPG
 	  GnuPG  is  a  set  of  programs for public key encryption
 	  and digital signatures.  The program most users will want
 	  to use is the OpenPGP command line tool, named gpg.
+
+if GNUPG
+
+config GNUPG_GPG
+	bool
+	prompt "Install gpg2 + symlink gpg => gpg2"
+
+config GNUPG_GPGV
+	bool
+	prompt "Install gpgv2"
+
+endif
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 67d6719..7f0270e 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -70,8 +70,13 @@ $(STATEDIR)/gnupg.targetinstall:
 	@$(call install_fixup, gnupg,AUTHOR,"Jiri Nesladek <nesladek@2n.cz>")
 	@$(call install_fixup, gnupg,DESCRIPTION,missing)
 
+ifdef PTXCONF_GNUPG_GPG
 	@$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpg2)
 	@$(call install_link, gnupg, gpg2, /usr/bin/gpg)
+endif
+ifdef PTXCONF_GNUPG_GPGV
+	@$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpgv2)
+endif
 
 	@$(call install_finish, gnupg)
 
-- 
2.1.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de