summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2023-02-28 15:24:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-01 21:29:31 +0000
commit02cd66a37a3a00469dc74028e85637dde5d5ae5b (patch)
treed016f029098994418a46ac834349acb3012b1a89
parent4ce6f7bcdd047bf8560516cbe5cd8bcc157b72db (diff)
downloadpoky-02cd66a37a3a00469dc74028e85637dde5d5ae5b.tar.gz
gpgme: fix python setuptools invalid version issue
The python3-gpg's version is now '1.18.0-unknown'. Such version has been treated as invalid for setuptools >=66.0.0. The error message is as below: pkg_resources.extern.packaging.version.InvalidVersion: Invalid version: '1.18.0-unknown' (package: gpg) Fix this issue by removing the '-unknown' suffix. (From OE-Core rev: 3a8bf81c5fb6111eab9784192754271efc85ee5c) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch34
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.18.0.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch
new file mode 100644
index 0000000000..81af86e7b2
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch
@@ -0,0 +1,34 @@
1From 46f346dff73122caffe62eda84596a3a3bec859e Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 28 Feb 2023 13:43:51 +0800
4Subject: [PATCH] autogen.sh: remove '-unknown' in version
5
6python setuptools >=66.0.0 treats '-unknown' as an invalid version.
7The error message is as below:
8 pkg_resources.extern.packaging.version.InvalidVersion: Invalid version: '1.18.0-unknown'
9
10Remove the '-unknown' suffix to fix this issue.
11
12Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2023-February/035293.html]
13
14Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
15---
16 autogen.sh | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/autogen.sh b/autogen.sh
20index 9b36158..d5cccd2 100755
21--- a/autogen.sh
22+++ b/autogen.sh
23@@ -266,7 +266,7 @@ if [ "$myhost" = "find-version" ]; then
24 else
25 ingit=no
26 beta=yes
27- tmp="-unknown"
28+ tmp=""
29 rev="0000000"
30 rvd="0"
31 fi
32--
332.17.1
34
diff --git a/meta/recipes-support/gpgme/gpgme_1.18.0.bb b/meta/recipes-support/gpgme/gpgme_1.18.0.bb
index 7ff4837d6f..a7b0de44a5 100644
--- a/meta/recipes-support/gpgme/gpgme_1.18.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.18.0.bb
@@ -22,6 +22,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
22 file://0008-do-not-auto-check-var-PYTHON.patch \ 22 file://0008-do-not-auto-check-var-PYTHON.patch \
23 file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ 23 file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \
24 file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \ 24 file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \
25 file://0001-autogen.sh-remove-unknown-in-version.patch \
25 " 26 "
26 27
27SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e" 28SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e"