[yocto-autobuilder-helper][PATCH] scripts/yocto-supported-distros: fix an incorrect regular expression for stream

[yocto-autobuilder-helper][PATCH] scripts/yocto-supported-distros: fix an incorrect regular expression for stream

[Antonin Godard]

The lsb string for CentOS Stream is actually centosstream-*, not
centos-*. It was thus not detecting centosstream entries in
SANITY_TESTED_DISTROS.

This was preventing the script from outputting the docs-formatted CentOS
strings.

Reported-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
 scripts/yocto-supported-distros | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/yocto-supported-distros b/scripts/yocto-supported-distros
index 11b05b7..f1dac04 100755
--- a/scripts/yocto-supported-distros
+++ b/scripts/yocto-supported-distros
@@ -83,7 +83,7 @@ INPUT_REGEXES = {
     },
     "centosstream": {
         "ab": re.compile(r"^stream(\d+)"),
-        "lsb": re.compile(r"^stream-(\d+)"),
+        "lsb": re.compile(r"^centosstream-(\d+)"),
     },
     "rocky": {
         "ab": re.compile(r"^rocky(\d+)"),

---
base-commit: 1fc6dae73202e4fdebaac26000c82c1b7a556ca8
change-id: 20260326-ysd-fix-centos-regexp-d47ee03ccd42

Re: [yocto-patches] [yocto-autobuilder-helper][PATCH] scripts/yocto-supported-distros: fix an incorrect regular expression for stream

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 1766 bytes --]

On Thu, 2026-03-26 at 17:22 +0100, Antonin Godard via
lists.yoctoproject.org wrote:
> The lsb string for CentOS Stream is actually centosstream-*, not
> centos-*. It was thus not detecting centosstream entries in
> SANITY_TESTED_DISTROS.
> 
> This was preventing the script from outputting the docs-formatted CentOS
> strings.
> 
> Reported-by: Yoann Congal <yoann.congal@smile.fr>
> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
> ---
>  scripts/yocto-supported-distros | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/yocto-supported-distros b/scripts/yocto-supported-distros
> index 11b05b7..f1dac04 100755
> --- a/scripts/yocto-supported-distros
> +++ b/scripts/yocto-supported-distros
> @@ -83,7 +83,7 @@ INPUT_REGEXES = {
>      },
>      "centosstream": {
>          "ab": re.compile(r"^stream(\d+)"),
> -        "lsb": re.compile(r"^stream-(\d+)"),
> +        "lsb": re.compile(r"^centosstream-(\d+)"),

Hi Antonin,

Where do you see centosstream-* reported?

On the stream9-vk-1 autobuilder worker and on a local centos stream 9
instance I see "centos-9":

    $ ( source /etc/os-release && echo $ID-$VERSION_ID )
    centos-9

We currently have "centosstream-9" listed as a supported distro, but if
I build on stream9-vk-1 I see:

    WARNING: Host distribution "centos-9" has not been validated with
    this version of the build system; you may possibly experience
    unexpected failures. It is recommended that you use a tested
    distribution.

So, I sent a patch for meta-yocto [1]. We should try to resolve which
one is correct.

[1]: https://lore.kernel.org/poky/20260403-centos-9-v1-1-e5324bd74ea3@pbarker.dev/T/

Best regards,

-- 
Paul Barker


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 252 bytes --]

Re: [yocto-patches] [yocto-autobuilder-helper][PATCH] scripts/yocto-supported-distros: fix an incorrect regular expression for stream

[Antonin Godard]

Hi,

On Mon Apr 6, 2026 at 10:49 AM CEST, Paul Barker wrote:
> On Thu, 2026-03-26 at 17:22 +0100, Antonin Godard via
> lists.yoctoproject.org wrote:
>> The lsb string for CentOS Stream is actually centosstream-*, not
>> centos-*. It was thus not detecting centosstream entries in
>> SANITY_TESTED_DISTROS.
>> 
>> This was preventing the script from outputting the docs-formatted CentOS
>> strings.
>> 
>> Reported-by: Yoann Congal <yoann.congal@smile.fr>
>> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
>> ---
>>  scripts/yocto-supported-distros | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/scripts/yocto-supported-distros b/scripts/yocto-supported-distros
>> index 11b05b7..f1dac04 100755
>> --- a/scripts/yocto-supported-distros
>> +++ b/scripts/yocto-supported-distros
>> @@ -83,7 +83,7 @@ INPUT_REGEXES = {
>>      },
>>      "centosstream": {
>>          "ab": re.compile(r"^stream(\d+)"),
>> -        "lsb": re.compile(r"^stream-(\d+)"),
>> +        "lsb": re.compile(r"^centosstream-(\d+)"),
>
> Hi Antonin,
>
> Where do you see centosstream-* reported?

In meta-yocto :)

> On the stream9-vk-1 autobuilder worker and on a local centos stream 9
> instance I see "centos-9":
>
>     $ ( source /etc/os-release && echo $ID-$VERSION_ID )
>     centos-9
>
> We currently have "centosstream-9" listed as a supported distro, but if
> I build on stream9-vk-1 I see:
>
>     WARNING: Host distribution "centos-9" has not been validated with
>     this version of the build system; you may possibly experience
>     unexpected failures. It is recommended that you use a tested
>     distribution.
>
> So, I sent a patch for meta-yocto [1]. We should try to resolve which
> one is correct.
>
> [1]: https://lore.kernel.org/poky/20260403-centos-9-v1-1-e5324bd74ea3@pbarker.dev/T/

Your fix to meta-yocto is the correct one. I didn't realize the issue was in
meta-yocto at first, and yocto-supported-distros uses meta-yocto as input.

This means that this commit can be reverted from yocto-autobuilder-helper. I'll
send a patch when yours is applied to meta-yocto.

Antonin

Re: [yocto-patches] [yocto-autobuilder-helper][PATCH] scripts/yocto-supported-distros: fix an incorrect regular expression for stream

[Richard Purdie]

On Tue, 2026-04-07 at 12:58 +0200, Antonin Godard via lists.yoctoproject.org wrote:
> Hi,
> 
> On Mon Apr 6, 2026 at 10:49 AM CEST, Paul Barker wrote:
> > On Thu, 2026-03-26 at 17:22 +0100, Antonin Godard via
> > lists.yoctoproject.org wrote:
> > > The lsb string for CentOS Stream is actually centosstream-*, not
> > > centos-*. It was thus not detecting centosstream entries in
> > > SANITY_TESTED_DISTROS.
> > > 
> > > This was preventing the script from outputting the docs-formatted CentOS
> > > strings.
> > > 
> > > Reported-by: Yoann Congal <yoann.congal@smile.fr>
> > > Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
> > > ---
> > >  scripts/yocto-supported-distros | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/scripts/yocto-supported-distros b/scripts/yocto-supported-distros
> > > index 11b05b7..f1dac04 100755
> > > --- a/scripts/yocto-supported-distros
> > > +++ b/scripts/yocto-supported-distros
> > > @@ -83,7 +83,7 @@ INPUT_REGEXES = {
> > >      },
> > >      "centosstream": {
> > >          "ab": re.compile(r"^stream(\d+)"),
> > > -        "lsb": re.compile(r"^stream-(\d+)"),
> > > +        "lsb": re.compile(r"^centosstream-(\d+)"),
> > 
> > Hi Antonin,
> > 
> > Where do you see centosstream-* reported?
> 
> In meta-yocto :)
> 
> > On the stream9-vk-1 autobuilder worker and on a local centos stream 9
> > instance I see "centos-9":
> > 
> >     $ ( source /etc/os-release && echo $ID-$VERSION_ID )
> >     centos-9
> > 
> > We currently have "centosstream-9" listed as a supported distro, but if
> > I build on stream9-vk-1 I see:
> > 
> >     WARNING: Host distribution "centos-9" has not been validated with
> >     this version of the build system; you may possibly experience
> >     unexpected failures. It is recommended that you use a tested
> >     distribution.
> > 
> > So, I sent a patch for meta-yocto [1]. We should try to resolve which
> > one is correct.
> > 
> > [1]: https://lore.kernel.org/poky/20260403-centos-9-v1-1-e5324bd74ea3@pbarker.dev/T/
> 
> Your fix to meta-yocto is the correct one. I didn't realize the issue was in
> meta-yocto at first, and yocto-supported-distros uses meta-yocto as input.
> 
> This means that this commit can be reverted from yocto-autobuilder-helper. I'll
> send a patch when yours is applied to meta-yocto.

I've applied it...

Cheers,

Richard

Re: [yocto-patches] [yocto-autobuilder-helper][PATCH] scripts/yocto-supported-distros: fix an incorrect regular expression for stream

[Antonin Godard]

Hi,

On Mon Apr 6, 2026 at 10:49 AM CEST, Paul Barker wrote:
> On Thu, 2026-03-26 at 17:22 +0100, Antonin Godard via
> lists.yoctoproject.org wrote:
>> The lsb string for CentOS Stream is actually centosstream-*, not
>> centos-*. It was thus not detecting centosstream entries in
>> SANITY_TESTED_DISTROS.
>> 
>> This was preventing the script from outputting the docs-formatted CentOS
>> strings.
>> 
>> Reported-by: Yoann Congal <yoann.congal@smile.fr>
>> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
>> ---
>>  scripts/yocto-supported-distros | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/scripts/yocto-supported-distros b/scripts/yocto-supported-distros
>> index 11b05b7..f1dac04 100755
>> --- a/scripts/yocto-supported-distros
>> +++ b/scripts/yocto-supported-distros
>> @@ -83,7 +83,7 @@ INPUT_REGEXES = {
>>      },
>>      "centosstream": {
>>          "ab": re.compile(r"^stream(\d+)"),
>> -        "lsb": re.compile(r"^stream-(\d+)"),
>> +        "lsb": re.compile(r"^centosstream-(\d+)"),
>
> Hi Antonin,
>
> Where do you see centosstream-* reported?
>
> On the stream9-vk-1 autobuilder worker and on a local centos stream 9
> instance I see "centos-9":
>
>     $ ( source /etc/os-release && echo $ID-$VERSION_ID )
>     centos-9
>
> We currently have "centosstream-9" listed as a supported distro, but if
> I build on stream9-vk-1 I see:
>
>     WARNING: Host distribution "centos-9" has not been validated with
>     this version of the build system; you may possibly experience
>     unexpected failures. It is recommended that you use a tested
>     distribution.
>
> So, I sent a patch for meta-yocto [1]. We should try to resolve which
> one is correct.
>
> [1]: https://lore.kernel.org/poky/20260403-centos-9-v1-1-e5324bd74ea3@pbarker.dev/T/

I'm a bit confused, why was this not a problem on whinlatter and scarthgap then?
Both of them have either centosstream-8 or centosstream-9 as their lsb string in
poky.conf.

https://git.yoctoproject.org/meta-yocto/tree/meta-poky/conf/distro/poky.conf?h=whinlatter
https://git.yoctoproject.org/meta-yocto/tree/meta-poky/conf/distro/poky.conf?h=scarthgap

Even CentOS Stream 8 images report centos-8 (with a local docker image):

$ docker run --rm -it quay.io/centos/centos:stream8 bash
[root@c33732bb804a /]# cat /etc/os-release
NAME="CentOS Stream"
VERSION="8"
ID="centos"
ID_LIKE="rhel fedora"
VERSION_ID="8"

Should we backport your change to both of these branches?

Antonin

Re: [yocto-patches] [yocto-autobuilder-helper][PATCH] scripts/yocto-supported-distros: fix an incorrect regular expression for stream

[Richard Purdie]

On Wed, 2026-04-08 at 09:25 +0200, Antonin Godard via
lists.yoctoproject.org wrote:
> Hi,
> 
> On Mon Apr 6, 2026 at 10:49 AM CEST, Paul Barker wrote:
> > On Thu, 2026-03-26 at 17:22 +0100, Antonin Godard via
> > lists.yoctoproject.org wrote:
> > > The lsb string for CentOS Stream is actually centosstream-*, not
> > > centos-*. It was thus not detecting centosstream entries in
> > > SANITY_TESTED_DISTROS.
> > > 
> > > This was preventing the script from outputting the docs-formatted
> > > CentOS
> > > strings.
> > > 
> > > Reported-by: Yoann Congal <yoann.congal@smile.fr>
> > > Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
> > > ---
> > >  scripts/yocto-supported-distros | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/scripts/yocto-supported-distros b/scripts/yocto-
> > > supported-distros
> > > index 11b05b7..f1dac04 100755
> > > --- a/scripts/yocto-supported-distros
> > > +++ b/scripts/yocto-supported-distros
> > > @@ -83,7 +83,7 @@ INPUT_REGEXES = {
> > >      },
> > >      "centosstream": {
> > >          "ab": re.compile(r"^stream(\d+)"),
> > > -        "lsb": re.compile(r"^stream-(\d+)"),
> > > +        "lsb": re.compile(r"^centosstream-(\d+)"),
> > 
> > Hi Antonin,
> > 
> > Where do you see centosstream-* reported?
> > 
> > On the stream9-vk-1 autobuilder worker and on a local centos stream
> > 9
> > instance I see "centos-9":
> > 
> >     $ ( source /etc/os-release && echo $ID-$VERSION_ID )
> >     centos-9
> > 
> > We currently have "centosstream-9" listed as a supported distro,
> > but if
> > I build on stream9-vk-1 I see:
> > 
> >     WARNING: Host distribution "centos-9" has not been validated
> > with
> >     this version of the build system; you may possibly experience
> >     unexpected failures. It is recommended that you use a tested
> >     distribution.
> > 
> > So, I sent a patch for meta-yocto [1]. We should try to resolve
> > which
> > one is correct.
> > 
> > [1]:
> > https://lore.kernel.org/poky/20260403-centos-9-v1-1-e5324bd74ea3@pbarker.dev/T/
> 
> I'm a bit confused, why was this not a problem on whinlatter and
> scarthgap then?
> Both of them have either centosstream-8 or centosstream-9 as their
> lsb string in
> poky.conf.
> 
> https://git.yoctoproject.org/meta-yocto/tree/meta-poky/conf/distro/poky.conf?h=whinlatter
> https://git.yoctoproject.org/meta-yocto/tree/meta-poky/conf/distro/poky.conf?h=scarthgap
> 
> Even CentOS Stream 8 images report centos-8 (with a local docker
> image):
> 
> $ docker run --rm -it quay.io/centos/centos:stream8 bash
> [root@c33732bb804a /]# cat /etc/os-release
> NAME="CentOS Stream"
> VERSION="8"
> ID="centos"
> ID_LIKE="rhel fedora"
> VERSION_ID="8"
> 
> Should we backport your change to both of these branches?

It does sound like we got that wrong so yes, we should probably fix it.

Cheers,

Richard