summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2025-04-01 08:49:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-04-03 11:06:20 +0100
commit95a1da64adc5240baee9aa42d40209d616e5b89d (patch)
tree3367a92470ce108928a9e6edb27b1e24e9526527
parentdd6aa2d57e8babebaef6ccd94b588c8e2e9ec59d (diff)
downloadpoky-95a1da64adc5240baee9aa42d40209d616e5b89d.tar.gz
python3-calver: upgrade 2022.6.26 -> 2025.04.01
Add tag to SRC_URI to verify SRCREV. Upstream improved their project.toml and removed much of setup.py meaning the patch was no longer needed. (From OE-Core rev: f6f7c4c14f16beead8a8adb649eb1b1da524a860) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch32
-rw-r--r--meta/recipes-devtools/python/python3-calver_2025.04.01.bb (renamed from meta/recipes-devtools/python/python3-calver_2022.6.26.bb)7
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch b/meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch
deleted file mode 100644
index 43f8a78ef0..0000000000
--- a/meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 390a233ed969f82b2ef209b23bfb523e785603f9 Mon Sep 17 00:00:00 2001
2From: Trevor Gamblin <tgamblin@baylibre.com>
3Date: Tue, 9 May 2023 10:19:41 -0400
4Subject: [PATCH] setup.py: hard-code version
5
6setup.py is pulling the build version from the current date rather than
7a release tag or other predictable method, causing reproducibility
8issues in builds. Patch this to make reproducible builds work while
9discussing this with upstream maintainer (or developing a patch that can
10make calver rely on a more standard pyproject.toml solution).
11
12Upstream-Status: Inappropriate (configuration)
13
14Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
15---
16 setup.py | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/setup.py b/setup.py
20index 73f6b10..2e27cf1 100644
21--- a/setup.py
22+++ b/setup.py
23@@ -42,5 +42,5 @@ setup(
24 "use_calver = calver.integration:version",
25 ],
26 },
27- version=calver_version(True),
28+ version=calver_version("2022.6.26"),
29 )
30--
312.40.0
32
diff --git a/meta/recipes-devtools/python/python3-calver_2022.6.26.bb b/meta/recipes-devtools/python/python3-calver_2025.04.01.bb
index b2e7e0769d..a05e787201 100644
--- a/meta/recipes-devtools/python/python3-calver_2022.6.26.bb
+++ b/meta/recipes-devtools/python/python3-calver_2025.04.01.bb
@@ -3,11 +3,8 @@ HOMEPAGE = "https://github.com/di/calver"
3LICENSE = "Apache-2.0" 3LICENSE = "Apache-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
5 5
6SRC_URI = " \ 6SRC_URI = "git://github.com/di/calver;branch=master;protocol=https;tag=${PV}"
7 git://github.com/di/calver;branch=master;protocol=https \ 7SRCREV = "5b62e5127f9ad5bb56bd09ccd8c44283a23ddb60"
8 file://0001-setup.py-hard-code-version.patch \
9"
10SRCREV = "3268d8acf2c345f32a1c5f08ba25dc67f76cca81"
11 8
12inherit python_setuptools_build_meta ptest-python-pytest 9inherit python_setuptools_build_meta ptest-python-pytest
13 10