Signed-off-by: Alexander Stein <alexander.st...@systec-electronic.com> --- rules/gnupg.in | 3 +++ rules/gnupg.make | 28 +++++++++++----------------- 2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/rules/gnupg.in b/rules/gnupg.in index 15e2071..66aaafe 100644 --- a/rules/gnupg.in +++ b/rules/gnupg.in @@ -2,6 +2,9 @@ config GNUPG tristate prompt "gnupg" + select LIBASSUAN + select LIBGCRYPT + select LIBKSBA select ZLIB help GnuPG - The GNU Privacy Guard suite of programs diff --git a/rules/gnupg.make b/rules/gnupg.make index 4ffc11a..5df0f9a 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg # # Paths and names # -GNUPG_VERSION := 1.4.10 +GNUPG_VERSION := 2.0.15 GNUPG := gnupg-$(GNUPG_VERSION) GNUPG_SUFFIX := tar.bz2 GNUPG_URL := ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) @@ -43,24 +43,19 @@ GNUPG_ENV = $(CROSS_ENV) # autoconf # GNUPG_AUTOCONF = $(CROSS_AUTOCONF_USR) \ - --disable-asm \ - --disable-card-support \ + --enable-gpg \ + --disable-gpgsm \ + --disable-agent \ + --disable-scdaemon \ + --disable-tools \ + --disable-doc \ --disable-exec \ - --disable-idea \ - --enable-cast5 \ - --enable-blowfish \ - --enable-aes \ - --enable-twofish \ - --enable-sha256 \ - --enable-sha512 \ --disable-exec \ --disable-photo-viewers \ --disable-keyserver-helpers \ --disable-ldap \ --disable-hkp \ - --disable-http \ --disable-finger \ - --disable-ftp \ --disable-keyserver-path \ --disable-largefile \ --disable-dns-srv \ @@ -68,10 +63,8 @@ GNUPG_AUTOCONF = $(CROSS_AUTOCONF_USR) \ --disable-rpath \ --disable-regex -ifdef PTXCONF_ICONV -GNUPG_AUTOCONF += --enable-gnupg-iconv -else -GNUPG_AUTOCONF += --disable-gnupg-iconv +ifndef PTXCONF_ICONV +GNUPG_AUTOCONF += --without-libiconv-prefix endif # ---------------------------------------------------------------------------- @@ -90,7 +83,8 @@ $(STATEDIR)/gnupg.targetinstall: @$(call install_fixup, gnupg,DEPENDS,) @$(call install_fixup, gnupg,DESCRIPTION,missing) - @$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpg) + @$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpg2) + @$(call install_link, gnupg, gpg2, /usr/bin/gpg) @$(call install_finish, gnupg) -- 1.7.1.1 -- ptxdist mailing list ptxdist@pengutronix.de