Message ID | 20230228061533.21075-1-Qi.Chen@windriver.com |
---|---|
State | Accepted, archived |
Commit | 3a8bf81c5fb6111eab9784192754271efc85ee5c |
Headers | show |
Series | gpgme: fix python setuptools invalid version issue | expand |
On Tue, 28 Feb 2023 at 07:15, Chen Qi <Qi.Chen@windriver.com> wrote: > +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: Pending As you have submitted upstream, please change to 'Submitted' with a link: https://lists.gnupg.org/pipermail/gnupg-devel/2023-February/date.html Alex
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..29f9d6a856 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch @@ -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: Pending + +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 + 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 \ 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"
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. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- ...autogen.sh-remove-unknown-in-version.patch | 34 +++++++++++++++++++ meta/recipes-support/gpgme/gpgme_1.18.0.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch