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

Yoann Congal <[email protected]>
Newsgroups org.yoctoproject.lists.yocto-patches
Message-ID <b7119bff3aa6faf31a2e72b33a8fe2040d407bd7.1777064869.git.yoann.congal@smile.fr>
From: Antonin Godard <[email protected]>

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 <[email protected]>
Signed-off-by: Antonin Godard <[email protected]>
Signed-off-by: Yoann Congal <[email protected]>
---
 scripts/yocto-supported-distros | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/scripts/yocto-supported-distros b/scripts/yocto-supported-distros
index cdd3967..3266d52 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": {
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.