diff mbox series

[whinlatter,yocto-autobuilder-helper] scripts/yocto-supported-distros: fix the centos stream regular expression

Message ID 20260409123254.182485-2-antonin.godard@bootlin.com
State New
Headers show
Series [whinlatter,yocto-autobuilder-helper] scripts/yocto-supported-distros: fix the centos stream regular expression | expand

Commit Message

Antonin Godard April 9, 2026, 12:32 p.m. UTC
The poky.conf file was wrongly referring these distros with
centosstream-*, but this is now fixed. Change the regular expression for CentOS
Stream to match this. Remove the CentOS (no Stream) definition as we do not
support it anymore and it conflicts with this one.

Cc: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
Needs to be merged with:
https://lore.kernel.org/r/20260408114639.453987-1-antonin.godard@bootlin.com
---
 scripts/yocto-supported-distros | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/scripts/yocto-supported-distros b/scripts/yocto-supported-distros
index 11b05b7..f01a401 100755
--- a/scripts/yocto-supported-distros
+++ b/scripts/yocto-supported-distros
@@ -77,13 +77,9 @@  INPUT_REGEXES = {
         "ab": re.compile(r"^opensuse(\d{2})(\d{1})"),
         "lsb": re.compile(r"^opensuse-(\d{2})\.(\d{1})"),
     },
-    "centos": {
-        "ab": re.compile(r"^centos(\d+)"),
-        "lsb": re.compile(r"^centos-(\d+)"),
-    },
     "centosstream": {
         "ab": re.compile(r"^stream(\d+)"),
-        "lsb": re.compile(r"^stream-(\d+)"),
+        "lsb": re.compile(r"^centos-(\d+)"),
     },
     "rocky": {
         "ab": re.compile(r"^rocky(\d+)"),
@@ -112,12 +108,8 @@  OUTPUT_FORMATS = {
         "lsb": "opensuseleap-{}.{}",
         "docs": "-  OpenSUSE Leap {}.{}",
     },
-    "centos": {
-        "lsb": "centos-{}",
-        "docs": "-  CentOS {}",
-    },
     "centosstream": {
-        "lsb": "centosstream-{}",
+        "lsb": "centos-{}",
         "docs": "-  CentOS Stream {}",
     },
     "rocky": {