| Message ID | 20250325-yocto-supported-distros-fix-v1-1-1a3abd4dc32b@bootlin.com |
|---|---|
| State | New |
| Headers | show |
| Series | [yocto-autobuilder-helper] scripts/yocto-supported-distros: consider any *master* branch to be master | expand |
diff --git a/scripts/yocto-supported-distros b/scripts/yocto-supported-distros index 0cc314b..172a186 100755 --- a/scripts/yocto-supported-distros +++ b/scripts/yocto-supported-distros @@ -160,8 +160,8 @@ def _get_current_core_release() -> str: ["bitbake-getvar", "--quiet", "--value", "METADATA_BRANCH"], encoding="utf-8") release = release.strip() - if release == "master": - return release + if "master" in release: + return "master" release = subprocess.check_output( ["bitbake-getvar", "--quiet", "--value", "LAYERSERIES_COMPAT_core"],
Testing builds often run on branches <someone>/master[-next]. In these cases we are really testing "master", so return that. Instead of exiting with: "Release <future release> does not exist". Signed-off-by: Antonin Godard <antonin.godard@bootlin.com> --- scripts/yocto-supported-distros | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: 40e3ac177d58484795b14cd1b9a18193bbdd4d2b change-id: 20250325-yocto-supported-distros-fix-dbf0d67ffe17 Best regards,