Skip to contentSkip to conversation

python3-unittest-automake-output: fix version mismatch

PATCH In review Yi Zhao 2 participants 8 messages Apr 17, 2025 – Apr 24, 2025

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/7 python3-unittest-automake-output: fix version mismatch

Backport patch to update __version__ to 0.2 to match current version.

---
 ...__version__-to-match-the-tag-version.patch | 30 +++++++++++++++++++
 .../python3-unittest-automake-output_0.2.bb   |  4 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/python/python3-unittest-automake-output/0001-Update-__version__-to-match-the-tag-version.patch
meta/recipes-devtools/python/python3-unittest-automake-output/0001-Update-__version__-to-match-the-tag-version.patch new file +30 -0
new file mode 100644
index 0000000000..c2e519a12a
@@ -0,0 +1,30 @@
+From 8da931c5e9e32a15091d517b28cdf2e2b5395f77 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Tue, 8 Apr 2025 15:55:42 +0800
+Subject: [PATCH] Update __version__ to match the tag version
+
+Update __version__ to 0.2 to match the current tag.
+
+Signed-off-by: Yi Zhao <[email protected]>
+
+Upstream-Status: Backport
+[https://gitlab.com/rossburton/python-unittest-automake-output/-/commit/8da931c5e9e32a15091d517b28cdf2e2b5395f77]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ src/putao/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/putao/__init__.py b/src/putao/__init__.py
+index e8758de..00265e2 100644
+--- a/src/putao/__init__.py
++++ b/src/putao/__init__.py
+@@ -5,4 +5,4 @@
+ Tools to write automake-style test reports.
+ """
+ 
+-__version__ = "0.1"
++__version__ = "0.2"
+-- 
+2.34.1
+
meta/recipes-devtools/python/python3-unittest-automake-output_0.2.bb +3 -1
index fefd4654c7..a8b834a126 100644
@@ -3,7 +3,9 @@ HOMEPAGE = "https://gitlab.com/rossburton/python-unittest-automake-output"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f6f16008d9fb7349f06609329f1ab93b"
 
-SRC_URI = "git://gitlab.com/rossburton/python-unittest-automake-output;protocol=https;branch=main"
+SRC_URI = "git://gitlab.com/rossburton/python-unittest-automake-output;protocol=https;branch=main \
+           file://0001-Update-__version__-to-match-the-tag-version.patch"
+
 SRCREV = "aebdfb188e368c690ea55cf6c9c9ffa1a52def65"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/7 libgpg-error: drop -unknown suffix from version number

If autogen.sh is run outside of a git repo, the find-version function always assumes that libgpg-error is a beta version and adds the suffix '-unknown' to the version number.

Befor the fix:

$ gpg-error --version
gpg-error (libgpg-error) 1.51-unknown

After the fix:

$ gpg-error --version
gpg-error (libgpg-error) 1.51
---
 ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++
 .../libgpg-error/libgpg-error_1.51.bb         |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch
meta/recipes-support/libgpg-error/libgpg-error/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file +35 -0
new file mode 100644
index 0000000000..cc6c35884c
@@ -0,0 +1,35 @@
+From 7358f4ff6c711bde1d83b9a38bbf349a23e0e243 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Tue, 15 Apr 2025 15:32:58 +0800
+Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number
+
+If autogen.sh is run outside of a git repo, the find-version function
+always assumes that libgpg-error is a beta version and adds the suffix
+'-unknown' to the version number. This should not work for users who use
+tarball and re-run autoconf in build directory.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ autogen.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 9f91297..daa2730 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -270,8 +270,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"
++      beta=no
++      tmp=""
+       cid="0000000"
+       rev="0000000"
+       rvd="0"
+-- 
+2.34.1
+
meta/recipes-support/libgpg-error/libgpg-error_1.51.bb +1 -0
index 741969beb0..9760b4d107 100644
@@ -17,6 +17,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch \
            file://0001-Do-not-fail-when-testing-config-scripts.patch \
+           file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch \
            file://run-ptest \
            "
 
Signature · 1 line
2.34.1
#2 lore raw

Re: [OE-core] [PATCH 2/7] libgpg-error: drop -unknown suffix from version number

Quoted 5 lines · Yi Zhao via lists.openembedded.org

If autogen.sh is run outside of a git repo, the find-version function always assumes that libgpg-error is a beta version and adds the suffix '-unknown' to the version number.

Quoted 7 lines

Befor the fix:

$ gpg-error --version
gpg-error (libgpg-error) 1.51-unknown

After the fix:

$ gpg-error --version
gpg-error (libgpg-error) 1.51

This series implies that we’ll be carrying patches against a number of recipes forever. As re-running autoreconf on a tarball isn’t unheard of it would be good to try and resolve this upstream somehow. Please discuss with upstream the use-case here, maybe the find-version script could also write the version to a hidden file which goes into the tarball which could be used if the directory isn’t a git tree.

Cheers,
Ross

author
#3 lore raw

PATCH 3/7 pinentry: drop -unknown suffix from version number

In reply to Yi Zhao

If autogen.sh is run outside of a git repo, the find-version function always assumes that pinentry is a beta version and adds the suffix '-unknown' to the version number.

Befor the fix:

$ pinentry --version
pinentry-curses (pinentry) 1.3.1-unknown

After the fix:

$ pinentry --version
pinentry-curses (pinentry) 1.3.1
---
 ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++
 .../pinentry/pinentry_1.3.1.bb                |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-support/pinentry/pinentry-1.3.1/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch
meta/recipes-support/pinentry/pinentry-1.3.1/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file +35 -0
new file mode 100644
index 0000000000..29aed68e40
@@ -0,0 +1,35 @@
+From 211fd00a631da3e907e3a78890bfd1cf3bbe069e Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Tue, 15 Apr 2025 15:32:58 +0800
+Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number
+
+If autogen.sh is run outside of a git repo, the find-version function
+always assumes that pinentry is a beta version and adds the suffix
+'-unknown' to the version number. This should not work for users who use
+tarball and re-run autoconf in build directory.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ autogen.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index e6efe33..6acff4d 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -269,8 +269,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"
++      beta=no
++      tmp=""
+       rev="0000000"
+       rvd="0"
+     fi
+-- 
+2.34.1
+
meta/recipes-support/pinentry/pinentry_1.3.1.bb +1 -0
index 14b368177c..aa0592d569 100644
@@ -14,6 +14,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://libassuan_pkgconf.patch \
            file://gpg-error_pkconf.patch \
+           file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch \
 "
 
 SRC_URI[sha256sum] = "bc72ee27c7239007ab1896c3c2fae53b076e2c9bd2483dc2769a16902bce8c04"
Signature · 1 line
2.34.1
author
#4 lore raw

PATCH 4/7 libgcrypt: drop -unknown suffix from version number

In reply to Yi Zhao

If autogen.sh is run outside of a git repo, the find-version function always assumes that libgcrypt is a beta version and adds the suffix '-unknown' to the version number.

Befor the fix:

$ mpicalc --version
mpicalc 2.0
libgcrypt 1.11.0-unknown

After the fix:

$ mpicalc --version
mpicalc 2.0
libgcrypt 1.11.0
---
 ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++
 .../libgcrypt/libgcrypt_1.11.0.bb             |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-support/libgcrypt/files/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch
meta/recipes-support/libgcrypt/files/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file +35 -0
new file mode 100644
index 0000000000..4870d4467b
@@ -0,0 +1,35 @@
+From 028305ba9ad7769d6f1747a4945949ced8761ba9 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Tue, 15 Apr 2025 15:32:58 +0800
+Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number
+
+If autogen.sh is run outside of a git repo, the find-version function
+always assumes that libgcrypt is a beta version and adds the suffix
+'-unknown' to the version number. This should not work for users who use
+tarball and re-run autoconf in build directory.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ autogen.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 9b36158..4b2e657 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -265,8 +265,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"
++      beta=no
++      tmp=""
+       rev="0000000"
+       rvd="0"
+     fi
+-- 
+2.34.1
+
meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb +1 -0
index ea1f34e8ce..712d2157f6 100644
@@ -24,6 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
            file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
            file://no-native-gpg-error.patch \
            file://no-bench-slope.patch \
+           file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch \
            file://run-ptest \
            "
 SRC_URI[sha256sum] = "09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c"
Signature · 1 line
2.34.1
author
#5 lore raw

PATCH 5/7 gnupg: drop -unknown suffix from version number

In reply to Yi Zhao

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
---
 ...h-fix-find-version-for-beta-checking.patch | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)
meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch +15 -7
index fc7d964ec4..5d5e2174c2 100644
@@ -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 <[email protected]>
 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 <[email protected]>
 
 Rebase to 2.1.23
 Signed-off-by: Hongxu Jia <[email protected]>
+
+Drop '-unknown' suffix from version number and set beta to no instead of
+removing it.
+
+Signed-off-by: Yi Zhao <[email protected]>
 ---
- 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"
Signature · 1 line
2.34.1
author
#6 lore raw

PATCH 6/7 libassuan: drop -unknown suffix from version number

In reply to Yi Zhao

If autogen.sh is run outside of a git repo, the find-version function always assumes that libassuan is a beta version and adds the suffix '-unknown' to the version number.

Befor the fix:

$ cat /usr/lib/pkgconfig/libassuan.pc
[snip]
Name: libassuan
Description: IPC library for the GnuPG components
Requires.private: gpg-error
Version: 3.0.2-unknown
Cflags: -I${includedir}
[snip]

After the fix:

$ cat /usr/lib/pkgconfig/libassuan.pc
[snip]
Name: libassuan
Description: IPC library for the GnuPG components
Requires.private: gpg-error
Version: 3.0.2
Cflags: -I${includedir}
[snip]
---
 ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++
 .../libassuan/libassuan_3.0.2.bb              |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-support/libassuan/libassuan/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch
meta/recipes-support/libassuan/libassuan/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file +35 -0
new file mode 100644
index 0000000000..5aff687e97
@@ -0,0 +1,35 @@
+From ecf05e7794edd56c6ff1cd7b14154e647dd0d787 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Tue, 15 Apr 2025 15:32:58 +0800
+Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number
+
+If autogen.sh is run outside of a git repo, the find-version function
+always assumes that libassuan is a beta version and adds the suffix
+'-unknown' to the version number. This should not work for users who use
+tarball and re-run autoconf in build directory.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ autogen.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 0b08e8b..0c5e425 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -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"
++      beta=no
++      tmp=""
+       cid="0000000"
+       rev="0000000"
+       rvd="0"
+-- 
+2.34.1
+
meta/recipes-support/libassuan/libassuan_3.0.2.bb +1 -0
index f0b7746284..e4e903366f 100644
@@ -18,6 +18,7 @@ DEPENDS = "libgpg-error"
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \
            file://libassuan-add-pkgconfig-support.patch \
+           file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch \
           "
 
 SRC_URI[sha256sum] = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6"
Signature · 1 line
2.34.1
author
#7 lore raw

PATCH 7/7 libksba: drop -unknown suffix from version number

In reply to Yi Zhao

If autogen.sh is run outside of a git repo, the find-version function always assumes that libksba is a beta version and adds the suffix '-unknown' to the version number.

Befor the fix:

$ cat /usr/lib/pkgconfig/ksba.pc
[snip]
Name: ksba
Description: X.509 and CMS support library
Requires: gpg-error
Version: 1.6.7-unknown
Cflags: -I${includedir}
[snip]

After the fix:

$ cat /usr/lib/pkgconfig/ksba.pc
[snip]
Name: ksba
Description: X.509 and CMS support library
Requires: gpg-error
Version: 1.6.7
Cflags: -I${includedir}
[snip]
---
 ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++
 meta/recipes-support/libksba/libksba_1.6.7.bb |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/libksba/libksba/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch
meta/recipes-support/libksba/libksba/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file +35 -0
new file mode 100644
index 0000000000..39d50af837
@@ -0,0 +1,35 @@
+From 5837fbaa76e6959ea895dc118893fb60957012fc Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Tue, 15 Apr 2025 15:32:58 +0800
+Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number
+
+If autogen.sh is run outside of a git repo, the find-version function
+always assumes that libksba is a beta version and adds the suffix
+'-unknown' to the version number. This should not work for users who use
+tarball and re-run autoconf in build directory.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ autogen.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index e6efe33..6acff4d 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -269,8 +269,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"
++      beta=no
++      tmp=""
+       rev="0000000"
+       rvd="0"
+     fi
+-- 
+2.34.1
+
meta/recipes-support/libksba/libksba_1.6.7.bb +2 -1
index b7a9fc4050..28ce97ac6a 100644
@@ -22,7 +22,8 @@ inherit autotools binconfig-disabled pkgconfig texinfo
 
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://ksba-add-pkgconfig-support.patch"
+           file://ksba-add-pkgconfig-support.patch \
+           file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch"
 
 SRC_URI[sha256sum] = "cf72510b8ebb4eb6693eef765749d83677a03c79291a311040a5bfd79baab763"
 
Signature · 1 line
2.34.1