summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2015-10-28 05:53:37 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-03 17:41:08 (GMT)
commitc1ba8e11747f3bc51f0bb4ecd485ccec23ac113e (patch)
tree16e263123f1599a2c5f12788dbcc89ab72deea0d
parentc3f5e64b583e0f8c62952f4c2a93c41310987bdf (diff)
downloadpoky-c1ba8e11747f3bc51f0bb4ecd485ccec23ac113e.tar.gz
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! (From OE-Core rev: d39e7ca717b67ad9f2f78b83d90d91e410e52965) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@
1From 717f994be2466d378e6611a4739c606db6d0dc46 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Sun, 25 Oct 2015 22:44:47 -0400
4Subject: [PATCH] autogen.sh: fix find-version for beta checking
5
6find-version always assumes that gnupg is beta if autogen.sh is run
7out of git-repo. This doesn't work for users whom just take release
8tarball and re-run autoconf in their local build dir.
9
10Upstream-Status: Pending
11
12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13---
14 autogen.sh | 1 -
15 1 file changed, 1 deletion(-)
16
17diff --git a/autogen.sh b/autogen.sh
18index 7effd56..d673432 100755
19--- a/autogen.sh
20+++ b/autogen.sh
21@@ -228,7 +228,6 @@ if [ "$myhost" = "find-version" ]; then
22 rvd=$((0x$(echo ${rev} | head -c 4)))
23 else
24 ingit=no
25- beta=yes
26 tmp="-unknown"
27 rev="0000000"
28 rvd="0"
29--
301.9.1
31
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 \
12 file://pkgconfig.patch \ 12 file://pkgconfig.patch \
13 file://use-pkgconfig-instead-of-npth-config.patch \ 13 file://use-pkgconfig-instead-of-npth-config.patch \
14 file://dirmngr-uses-libgpg-error.patch \ 14 file://dirmngr-uses-libgpg-error.patch \
15 file://autogen.sh-fix-find-version-for-beta-checking.patch \
15 " 16 "
16 17
17SRC_URI[md5sum] = "ebdf92b15b8bcd8579b643c7f41a3238" 18SRC_URI[md5sum] = "ebdf92b15b8bcd8579b643c7f41a3238"