@@ -1,4 +1,4 @@
-From 4d8cc1982273d571b4e80fe981878d0fa5884236 Mon Sep 17 00:00:00 2001
+From 8152507a5ee312889366177c48fd99dc351d4c41 Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong.fan@windriver.com>
Date: Wed, 16 Aug 2017 11:23:22 +0800
Subject: [PATCH] autogen.sh: fix find-version for beta checking
@@ -7,25 +7,33 @@ 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
+Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Rebase to 2.1.23
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Drop '-unknown' suffix from version number and set beta to no instead of
+removing it.
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- autogen.sh | 1 -
- 1 file changed, 1 deletion(-)
+ autogen.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh
-index 9f91297..116fb7f 100755
+index 0b08e8b..0c5e425 100755
--- a/autogen.sh
+++ b/autogen.sh
-@@ -270,7 +270,6 @@ if [ "$myhost" = "find-version" ]; then
+@@ -284,8 +284,8 @@ if [ "$myhost" = "find-version" ]; then
rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
else
ingit=no
- beta=yes
- tmp="-unknown"
+- tmp="-unknown"
++ beta=no
++ tmp=""
cid="0000000"
rev="0000000"
+ rvd="0"
If autogen.sh is run outside of a git repo, the find-version function always assumes that gnupg is a beta version and adds the suffix '-unknown' to the version number. Befor the fix: $ gpg --version gpg (GnuPG) 2.5.5-unknown After the fix: $ gpg --version gpg (GnuPG) 2.5.5 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- ...h-fix-find-version-for-beta-checking.patch | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-)