mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Andreas Pretzsch <apr@cn-eng.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH] gnupg: targetinstall: make gpg/gpg2 and gpgv2 selectable
Date: Tue, 17 Mar 2015 22:03:36 +0100	[thread overview]
Message-ID: <1426626216-24698-1-git-send-email-apr@cn-eng.de> (raw)

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

             reply	other threads:[~2015-03-17 21:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-17 21:03 Andreas Pretzsch [this message]
2015-03-26  8:50 ` Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426626216-24698-1-git-send-email-apr@cn-eng.de \
    --to=apr@cn-eng.de \
    --cc=p.zabel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox