diff mbox

libgpgme: Take into account that gnupg and gnupg2 are mutual exclusive

Message ID 1409228181-29052-1-git-send-email-Vincent.Riera@imgtec.com
State Accepted
Commit 0a9a32d6928cd7c4871866b6512a7778d5e0671f
Headers show

Commit Message

Vicente Olivert Riera Aug. 28, 2014, 12:16 p.m. UTC
Avoid that libgpgme can select the gnupg package although gnupg2 has
been already selected. Both packages are mutual exclusive and shouldn't
be selected at the same time.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/libgpgme/Config.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Peter Korsgaard Aug. 30, 2014, 9:59 p.m. UTC | #1
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

 > Avoid that libgpgme can select the gnupg package although gnupg2 has
 > been already selected. Both packages are mutual exclusive and shouldn't
 > be selected at the same time.

 > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 > ---
 >  package/libgpgme/Config.in |    2 +-
 >  1 files changed, 1 insertions(+), 1 deletions(-)

 > diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in
 > index a303bfa..e176dac 100644
 > --- a/package/libgpgme/Config.in
 > +++ b/package/libgpgme/Config.in
 > @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBGPGME
 >  	bool "libgpgme"
 >  	depends on BR2_USE_MMU # libassuan
 >  	#gnupg is not needed to build, but at runtime.
 > -	select BR2_PACKAGE_GNUPG
 > +	select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2

Committed, thanks.

I'm not familiar with libgpgme. Does it need to be configured somehow to
use gpg2 instead of gpg? Would it make sense to automatically configure
this if BR2_PACKAGE_GNUPG2 is enabled?
diff mbox

Patch

diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in
index a303bfa..e176dac 100644
--- a/package/libgpgme/Config.in
+++ b/package/libgpgme/Config.in
@@ -2,7 +2,7 @@  config BR2_PACKAGE_LIBGPGME
 	bool "libgpgme"
 	depends on BR2_USE_MMU # libassuan
 	#gnupg is not needed to build, but at runtime.
-	select BR2_PACKAGE_GNUPG
+	select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2
 	select BR2_PACKAGE_LIBGPG_ERROR
 	select BR2_PACKAGE_LIBASSUAN
 	help