* [2.18][PATCH 1/5] fetch2/git.py: add filter_regex parameter to latest_versionstring
2026-09-02 9:57 [2.18][PATCH 0/5] Add case for filter_regex parameter in latest_versionstring daniel.turull
@ 2026-09-02 9:57 ` daniel.turull
2026-09-02 9:57 ` [2.18][PATCH 2/5] fetch2/wget.py: " daniel.turull
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: daniel.turull @ 2026-09-02 9:57 UTC (permalink / raw)
To: bitbake-devel
Cc: Chen Qi, Mathieu Dubois-Briand, Richard Purdie, Daniel Turull
From: Chen Qi <Qi.Chen@windriver.com>
We want to be able to do stable version upgrade for recipes. For
example, 1.0.0 -> 1.0.1 instead of 1.0.0 -> 1.1.0.
To to this, we need an extra paramter to latest_versionstring
so that we are able to filter out the versions we need. Using regex
has the advantage of adapting to different version schemes.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 51842f8bc83203ff19e202361d2bb66e0c9f6381)
Signed-off-by: Daniel Turull <daniel.turull@ericsson.com>
---
lib/bb/fetch2/git.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index 5134ec04c..0649429e5 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -975,7 +975,7 @@ class Git(FetchMethod):
raise bb.fetch2.FetchError("Unable to resolve '%s' in upstream git repository in git ls-remote output for %s" % \
(ud.unresolvedrev, ud.host+ud.path))
- def latest_versionstring(self, ud, d):
+ def latest_versionstring(self, ud, d, filter_regex=None):
"""
Compute the latest release name like "x.y.x" in "x.y.x+gitHASH"
by searching through the tags output of ls-remote, comparing
@@ -1015,6 +1015,10 @@ class Git(FetchMethod):
pver = m.group('pver').replace("_", ".")
+ if filter_regex:
+ if not re.match(filter_regex, pver):
+ continue
+
if verstring and bb.utils.vercmp(("0", pver, ""), ("0", verstring, "")) < 0:
continue
^ permalink raw reply related [flat|nested] 6+ messages in thread* [2.18][PATCH 2/5] fetch2/wget.py: add filter_regex parameter to latest_versionstring
2026-09-02 9:57 [2.18][PATCH 0/5] Add case for filter_regex parameter in latest_versionstring daniel.turull
2026-09-02 9:57 ` [2.18][PATCH 1/5] fetch2/git.py: add filter_regex parameter to latest_versionstring daniel.turull
@ 2026-09-02 9:57 ` daniel.turull
2026-09-02 9:57 ` [2.18][PATCH 3/5] fetch2/crate.py: " daniel.turull
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: daniel.turull @ 2026-09-02 9:57 UTC (permalink / raw)
To: bitbake-devel
Cc: Chen Qi, Mathieu Dubois-Briand, Richard Purdie, Daniel Turull
From: Chen Qi <Qi.Chen@windriver.com>
We want to be able to do stable version upgrade for recipes. For
example, 1.0.0 -> 1.0.1 instead of 1.0.0 -> 1.1.0.
To to this, we need an extra paramter to latest_versionstring
so that we are able to filter out the versions we need. Using regex
has the advantage of adapting to different version schemes.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b1c4a431b080ee328fbf21543258e226a464c118)
Signed-off-by: Daniel Turull <daniel.turull@ericsson.com>
---
lib/bb/fetch2/wget.py | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py
index fc83b301a..c292dfe7e 100644
--- a/lib/bb/fetch2/wget.py
+++ b/lib/bb/fetch2/wget.py
@@ -515,7 +515,7 @@ class Wget(FetchMethod):
return fetchresult
- def _check_latest_version(self, url, package, package_regex, current_version, ud, d):
+ def _check_latest_version(self, url, package, package_regex, current_version, ud, d, filter_regex=None):
"""
Return the latest version of a package inside a given directory path
If error or no version, return ""
@@ -538,6 +538,11 @@ class Wget(FetchMethod):
newver = self._parse_path(package_regex, str(line))
if newver:
+ if filter_regex:
+ # filter_regex is derived from PV, and uses . as separator
+ # while upstream may be using _ as separator
+ if not re.match(filter_regex, re.sub('_', '.', newver[1])):
+ continue
bb.debug(3, "Upstream version found: %s" % newver[1])
if valid == 0:
version = newver
@@ -555,7 +560,7 @@ class Wget(FetchMethod):
return ""
- def _check_latest_version_by_dir(self, dirver, package, package_regex, current_version, ud, d):
+ def _check_latest_version_by_dir(self, dirver, package, package_regex, current_version, ud, d, filter_regex=None):
"""
Scan every directory in order to get upstream version.
"""
@@ -599,7 +604,7 @@ class Wget(FetchMethod):
ud.user, ud.pswd, {}])
pupver = self._check_latest_version(uri,
- package, package_regex, current_version, ud, d)
+ package, package_regex, current_version, ud, d, filter_regex)
if pupver:
version[1] = pupver
@@ -660,7 +665,7 @@ class Wget(FetchMethod):
return package_custom_regex_comp
- def latest_versionstring(self, ud, d):
+ def latest_versionstring(self, ud, d, filter_regex=None):
"""
Manipulate the URL and try to obtain the latest package version
@@ -701,11 +706,11 @@ class Wget(FetchMethod):
dirver_pn_regex = re.compile(r"%s\d?" % (re.escape(pn)))
if not dirver_pn_regex.search(dirver):
return (self._check_latest_version_by_dir(dirver,
- package, package_regex, current_version, ud, d), '')
+ package, package_regex, current_version, ud, d, filter_regex), '')
uri = bb.fetch.encodeurl([ud.type, ud.host, path, ud.user, ud.pswd, {}])
else:
uri = regex_uri
return (self._check_latest_version(uri, package, package_regex,
- current_version, ud, d), '')
+ current_version, ud, d, filter_regex), '')
^ permalink raw reply related [flat|nested] 6+ messages in thread* [2.18][PATCH 3/5] fetch2/crate.py: add filter_regex parameter to latest_versionstring
2026-09-02 9:57 [2.18][PATCH 0/5] Add case for filter_regex parameter in latest_versionstring daniel.turull
2026-09-02 9:57 ` [2.18][PATCH 1/5] fetch2/git.py: add filter_regex parameter to latest_versionstring daniel.turull
2026-09-02 9:57 ` [2.18][PATCH 2/5] fetch2/wget.py: " daniel.turull
@ 2026-09-02 9:57 ` daniel.turull
2026-09-02 9:57 ` [2.18][PATCH 4/5] fetch2/__init__.py: add filter_regex to default latest_versionstring daniel.turull
2026-09-02 9:57 ` [2.18][PATCH 5/5] bb/tests/fetch.py: add case for filter_regex parameter in latest_versionstring daniel.turull
4 siblings, 0 replies; 6+ messages in thread
From: daniel.turull @ 2026-09-02 9:57 UTC (permalink / raw)
To: bitbake-devel
Cc: Chen Qi, Mathieu Dubois-Briand, Richard Purdie, Daniel Turull
From: Chen Qi <Qi.Chen@windriver.com>
We want to be able to do stable version upgrade for recipes. For
example, 1.0.0 -> 1.0.1 instead of 1.0.0 -> 1.1.0.
To to this, we need an extra paramter to latest_versionstring
so that we are able to filter out the versions we need. Using regex
has the advantage of adapting to different version schemes.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 592477f225868e227110477f52691e031903430a)
Signed-off-by: Daniel Turull <daniel.turull@ericsson.com>
---
lib/bb/fetch2/crate.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/bb/fetch2/crate.py b/lib/bb/fetch2/crate.py
index eb1fd5719..6133d3756 100644
--- a/lib/bb/fetch2/crate.py
+++ b/lib/bb/fetch2/crate.py
@@ -13,6 +13,7 @@ BitBake 'Fetch' implementation for crates.io
import hashlib
import json
import os
+import re
import subprocess
import bb
from bb.fetch2 import logger, subprocess_setup, UnpackError
@@ -155,18 +156,20 @@ class Crate(Wget):
with open(mdpath, "w") as f:
json.dump(metadata, f)
- def latest_versionstring(self, ud, d):
+ def latest_versionstring(self, ud, d, filter_regex=None):
"""
Return the latest version available when versionsurl is the [name]/versions URL.
"""
from functools import cmp_to_key
json_data = json.loads(self._fetch_index(ud.versionsurl, ud, d))
versions = [(0, i["num"], "") for i in json_data["versions"]]
+ if filter_regex:
+ versions = [v for v in versions if re.match(filter_regex, v[1])]
versions = sorted(versions, key=cmp_to_key(bb.utils.vercmp))
return (versions[-1][1], "") if versions else ("", "")
- def latest_versionstring_from_index(self, ud, d):
+ def latest_versionstring_from_index(self, ud, d, filter_regex=None):
"""
Return the latest version available when versionsurl is a Cargo index
file.
@@ -181,5 +184,8 @@ class Crate(Wget):
if not data.get("yanked", False):
versions.append((0, data["vers"], ""))
+ if filter_regex:
+ versions = [v for v in versions if re.match(filter_regex, v[1])]
+
versions = sorted(versions, key=cmp_to_key(bb.utils.vercmp))
return (versions[-1][1], "") if versions else ("", "")
^ permalink raw reply related [flat|nested] 6+ messages in thread* [2.18][PATCH 4/5] fetch2/__init__.py: add filter_regex to default latest_versionstring
2026-09-02 9:57 [2.18][PATCH 0/5] Add case for filter_regex parameter in latest_versionstring daniel.turull
` (2 preceding siblings ...)
2026-09-02 9:57 ` [2.18][PATCH 3/5] fetch2/crate.py: " daniel.turull
@ 2026-09-02 9:57 ` daniel.turull
2026-09-02 9:57 ` [2.18][PATCH 5/5] bb/tests/fetch.py: add case for filter_regex parameter in latest_versionstring daniel.turull
4 siblings, 0 replies; 6+ messages in thread
From: daniel.turull @ 2026-09-02 9:57 UTC (permalink / raw)
To: bitbake-devel
Cc: Chen Qi, Mathieu Dubois-Briand, Richard Purdie, Daniel Turull
From: Chen Qi <Qi.Chen@windriver.com>
Add filter_regex parameter to the default latest_versionstring
function so that fetchers that do not implement this function can also
take the filter_regex parameter.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 52f4d0ffd4a51b8c279eb5df157c90fe7d471a55)
Signed-off-by: Daniel Turull <daniel.turull@ericsson.com>
---
lib/bb/fetch2/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index e0494b3cb..6f5f5e792 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1734,7 +1734,7 @@ class FetchMethod(object):
def generate_revision_key(self, ud, d, name):
return self._revision_key(ud, d, name)
- def latest_versionstring(self, ud, d):
+ def latest_versionstring(self, ud, d, filter_regex=None):
"""
Compute the latest release name like "x.y.x" in "x.y.x+gitHASH"
by searching through the tags output of ls-remote, comparing
^ permalink raw reply related [flat|nested] 6+ messages in thread* [2.18][PATCH 5/5] bb/tests/fetch.py: add case for filter_regex parameter in latest_versionstring
2026-09-02 9:57 [2.18][PATCH 0/5] Add case for filter_regex parameter in latest_versionstring daniel.turull
` (3 preceding siblings ...)
2026-09-02 9:57 ` [2.18][PATCH 4/5] fetch2/__init__.py: add filter_regex to default latest_versionstring daniel.turull
@ 2026-09-02 9:57 ` daniel.turull
4 siblings, 0 replies; 6+ messages in thread
From: daniel.turull @ 2026-09-02 9:57 UTC (permalink / raw)
To: bitbake-devel
Cc: Chen Qi, Mathieu Dubois-Briand, Richard Purdie, Daniel Turull
From: Chen Qi <Qi.Chen@windriver.com>
Add bitbake selftest case for fitler_regex parameter in
latest_versionstring to ensure no regression.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 63a51b543e17d44c26a82e6ca911ed23e517fc33)
Signed-off-by: Daniel Turull <daniel.turull@ericsson.com>
---
lib/bb/tests/fetch.py | 78 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 77 insertions(+), 1 deletion(-)
diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py
index c071401e6..2ebfd6680 100644
--- a/lib/bb/tests/fetch.py
+++ b/lib/bb/tests/fetch.py
@@ -1577,7 +1577,24 @@ class FetchLatestVersionTest(FetcherTest):
# basic example; version pattern "A.B.C+cargo-D.E.F"
("cargo-c", "crate://crates.io/cargo-c/0.9.18+cargo-0.69")
: "0.9.29"
- }
+ }
+
+ test_git_stable_uris = {
+ ("dtc", "git://git.yoctoproject.org/bbfetchtests-dtc.git;branch=master;protocol=https", "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf", "", r"^1\.4\.\d+$")
+ : ("1.4.0", "1.5.0"),
+ ("systemd", "git://github.com/systemd/systemd.git;protocol=https;branch=stable/v259-stable", "b3d8fc43e9cb531d958c17ef2cd93b374bc14e8a", "", r"^259\.\d+$")
+ : ("259.5", "260")
+ }
+
+ test_wget_stable_uris = {
+ ("openssh", "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-10.2p1.tar.gz", "10.2p1", "", "", r"^10\.2p\d+$")
+ : ("10.2p1", "10.3")
+ }
+
+ test_crate_stable_uris = {
+ ("cargo-c", "crate://crates.io/cargo-c/0.9.18+cargo-0.69", r"^0\.9\.\d+")
+ : ("0.9.29", "0.10.0")
+ }
@skipIfNoNetwork()
def test_git_latest_versionstring(self):
@@ -1634,6 +1651,65 @@ class FetchLatestVersionTest(FetcherTest):
r = bb.utils.vercmp_string(v, verstring)
self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring))
+ @skipIfNoNetwork()
+ def test_git_latest_versionstring_stable(self):
+ for k, v in self.test_git_stable_uris.items():
+ with self.subTest(pn=k[0]):
+ self.d.setVar("PN", k[0])
+ self.d.setVar("SRCREV", k[2])
+ self.d.setVar("UPSTREAM_CHECK_GITTAGREGEX", k[3])
+ filter_regex = k[4]
+ ud = bb.fetch2.FetchData(k[1], self.d)
+ pupver= ud.method.latest_versionstring(ud, self.d, filter_regex=filter_regex)
+ verstring = pupver[0]
+ self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0])
+ v_less_or_equal = v[0]
+ v_larger = v[1]
+ r = bb.utils.vercmp_string(v_less_or_equal, verstring)
+ self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s < %s" % (k[0], v_less_or_equal, verstring))
+ r = bb.utils.vercmp_string(verstring, v_larger)
+ self.assertTrue(r == -1, msg="Package %s, version: %s <= %s" % (k[0], v_larger, verstring))
+
+ @skipIfNoNetwork()
+ def test_wget_latest_versionstring_stable(self):
+ for k, v in self.test_wget_stable_uris.items():
+ with self.subTest(pn=k[0]):
+ self.d.setVar("PN", k[0])
+ url = k[1]
+ self.d.setVar("PV", k[2])
+ if k[3]:
+ self.d.setVar("UPSTREAM_CHECK_URI", k[3])
+ if k[4]:
+ self.d.setVar("UPSTREAM_CHECK_REGEX", k[4])
+ filter_regex = k[5]
+ ud = bb.fetch2.FetchData(url, self.d)
+ pupver= ud.method.latest_versionstring(ud, self.d, filter_regex=filter_regex)
+ verstring = pupver[0]
+ self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0])
+ v_less_or_equal = v[0]
+ v_larger = v[1]
+ r = bb.utils.vercmp_string(v_less_or_equal, verstring)
+ self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s < %s" % (k[0], v_less_or_equal, verstring))
+ r = bb.utils.vercmp_string(verstring, v_larger)
+ self.assertTrue(r == -1, msg="Package %s, version: %s <= %s" % (k[0], v_larger, verstring))
+
+ @skipIfNoNetwork()
+ def test_crate_latest_versionstring_stable(self):
+ for k, v in self.test_crate_stable_uris.items():
+ with self.subTest(pn=k[0]):
+ self.d.setVar("PN", k[0])
+ ud = bb.fetch2.FetchData(k[1], self.d)
+ filter_regex = k[2]
+ pupver = ud.method.latest_versionstring(ud, self.d, filter_regex=filter_regex)
+ verstring = pupver[0]
+ self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0])
+ v_less_or_equal = v[0]
+ v_larger = v[1]
+ r = bb.utils.vercmp_string(v_less_or_equal, verstring)
+ self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s < %s" % (k[0], v_less_or_equal, verstring))
+ r = bb.utils.vercmp_string(verstring, v_larger)
+ self.assertTrue(r == -1, msg="Package %s, version: %s <= %s" % (k[0], v_larger, verstring))
+
class FetchCheckStatusTest(FetcherTest):
test_wget_uris = ["https://downloads.yoctoproject.org/releases/sato/sato-engine-0.1.tar.gz",
"https://downloads.yoctoproject.org/releases/sato/sato-engine-0.2.tar.gz",
^ permalink raw reply related [flat|nested] 6+ messages in thread