On Tue, Mar 17, 2015 at 10:03:36PM +0100, Andreas Pretzsch wrote: > Add new config options for targetinstall: > GNUPG_GPG : Install gpg2 + symlink gpg => gpg2 > GNUPG_GPGV : Install gpgv2 > > Signed-off-by: Andreas Pretzsch <[email protected]> > Cc: Philipp Zabel <[email protected]> > --- > 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.
Thanks, applied (It's already in ptxdist-2015.03.0). I've left it as is, but added a migrate helper to enable GNUPG_GPG during migrate. Michael > > 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 <[email protected]>") > @$(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 > [email protected] > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list [email protected]
