diff options
| author | Wenzong Fan <wenzong.fan@windriver.com> | 2015-10-28 01:53:37 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:20:25 +0000 |
| commit | a37cccca3bb3bad0d8d7e375fb7e3cc339ac8250 (patch) | |
| tree | ec13083fc6e7fbb275a084eb26d7dfd39e291b5b /meta/recipes-support | |
| parent | 91a159e64d404653b2d9178caf027f797a4d3f3b (diff) | |
| download | openembedded-core-a37cccca3bb3bad0d8d7e375fb7e3cc339ac8250.tar.gz openembedded-core-a37cccca3bb3bad0d8d7e375fb7e3cc339ac8250.tar.bz2 openembedded-core-a37cccca3bb3bad0d8d7e375fb7e3cc339ac8250.zip | |
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>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.1.7.bb | 1 |
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 0000000000..4241bc3a2e --- /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 48c7c9622d..979e6f9b99 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" |