aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2015-10-28 01:53:37 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-03 17:40:52 +0000
commitd39e7ca717b67ad9f2f78b83d90d91e410e52965 (patch)
treee50019efda3cf4f2d0f7a8b8bb92b89fbf583845
parent39ef8e22b52d3f5daa853aa7866145e9c5469d4b (diff)
downloadopenembedded-core-d39e7ca717b67ad9f2f78b83d90d91e410e52965.zip
openembedded-core-d39e7ca717b67ad9f2f78b83d90d91e410e52965.tar.gz
openembedded-core-d39e7ca717b67ad9f2f78b83d90d91e410e52965.tar.bz2
gnupg: fix find-version for beta checking
find-version always assumes that gnupg is beta if autogen.sh is run out of git-repo. This doesn't work for users whom just take release tarball and re-run autoconf in their local build dir. This fixes runtime issue: $gpg --list-sigs gpg: NOTE: THIS IS A DEVELOPMENT VERSION! gpg: It is only intended for test purposes and should NOT be gpg: used in a production environment or with production keys! Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch31
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.1.7.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch b/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch
new file mode 100644
index 0000000..4241bc3
--- /dev/null
+++ b/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch
@@ -0,0 +1,31 @@
+From 717f994be2466d378e6611a4739c606db6d0dc46 Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Sun, 25 Oct 2015 22:44:47 -0400
+Subject: [PATCH] autogen.sh: fix find-version for beta checking
+
+find-version always assumes that gnupg is beta if autogen.sh is run
+out of git-repo. This doesn't work for users whom just take release
+tarball and re-run autoconf in their local build dir.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+---
+ autogen.sh | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 7effd56..d673432 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -228,7 +228,6 @@ if [ "$myhost" = "find-version" ]; then
+ rvd=$((0x$(echo ${rev} | head -c 4)))
+ else
+ ingit=no
+- beta=yes
+ tmp="-unknown"
+ rev="0000000"
+ rvd="0"
+--
+1.9.1
+
diff --git a/meta/recipes-support/gnupg/gnupg_2.1.7.bb b/meta/recipes-support/gnupg/gnupg_2.1.7.bb
index 48c7c96..979e6f9 100644
--- a/meta/recipes-support/gnupg/gnupg_2.1.7.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.1.7.bb
@@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
file://pkgconfig.patch \
file://use-pkgconfig-instead-of-npth-config.patch \
file://dirmngr-uses-libgpg-error.patch \
+ file://autogen.sh-fix-find-version-for-beta-checking.patch \
"
SRC_URI[md5sum] = "ebdf92b15b8bcd8579b643c7f41a3238"