@@ -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"^centosstream-(\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": {
The poky.conf file was wrongly referring these distros with centosstream-*, but this is now fixed with [1]. 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. [1]: https://git.yoctoproject.org/meta-yocto/commit/?id=2ed5aa3ac9eb7082b2534f12fb6b2f7fc3dc4bee Signed-off-by: Antonin Godard <antonin.godard@bootlin.com> --- scripts/yocto-supported-distros | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)