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>
This commit is contained in:
Chen Qi
2023-02-28 15:24:51 +08:00
committed by Richard Purdie
parent 4ce6f7bcdd
commit 02cd66a37a
2 changed files with 35 additions and 0 deletions

View File

@@ -0,0 +1,34 @@
From 46f346dff73122caffe62eda84596a3a3bec859e Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Tue, 28 Feb 2023 13:43:51 +0800
Subject: [PATCH] autogen.sh: remove '-unknown' in version
python setuptools >=66.0.0 treats '-unknown' as an invalid version.
The error message is as below:
pkg_resources.extern.packaging.version.InvalidVersion: Invalid version: '1.18.0-unknown'
Remove the '-unknown' suffix to fix this issue.
Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2023-February/035293.html]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
autogen.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autogen.sh b/autogen.sh
index 9b36158..d5cccd2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -266,7 +266,7 @@ if [ "$myhost" = "find-version" ]; then
else
ingit=no
beta=yes
- tmp="-unknown"
+ tmp=""
rev="0000000"
rvd="0"
fi
--
2.17.1

View File

@@ -22,6 +22,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
file://0008-do-not-auto-check-var-PYTHON.patch \
file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \
file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \
file://0001-autogen.sh-remove-unknown-in-version.patch \
"
SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e"