gnupg: fix find-version for beta checking
v2 cover gnupg: fix find-version for beta checking
From: Wenzong Fan <[email protected]>
V2 changes:
Fix find-version beta checking logic from autogen.sh instead of set development_version to 'no' in configure.ac.
The following changes since commit 8a0d8eee432924433c3e70198aaeab3161476c5f:
toaster manual: Updated the set up and use chapter (2015-10-27 07:28:22 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/gnupg-new
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/gnupg-new
Wenzong Fan (1):
gnupg: fix find-version for beta checking
...gen.sh-fix-find-version-for-beta-checking.patch | 31 ++++++++++++++++++++++ meta/recipes-support/gnupg/gnupg_2.1.7.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch
Signature · 1 line
1.9.1
PATCH v2 1/1 gnupg: fix find-version for beta checking
From: Wenzong Fan <[email protected]>
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!
--- ...gen.sh-fix-find-version-for-beta-checking.patch | 31 ++++++++++++++++++++++ meta/recipes-support/gnupg/gnupg_2.1.7.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch
meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 717f994be2466d378e6611a4739c606db6d0dc46 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <[email protected]> +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 <[email protected]> +--- + 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 +
meta/recipes-support/gnupg/gnupg_2.1.7.bb +1 -0
@@ -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"
Signature · 1 line
1.9.1