[yocto-autobuilder-helper][whinlatter 5/5] scripts/yocto-supported-distros: fix the centos stream regular expression
Yoann Congal <[email protected]>
| Newsgroups | org.yoctoproject.lists.yocto-patches |
|---|---|
| Message-ID | <93894832c9a4ce0b96d16e503bed99a959f3d232.1776323183.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 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": {