[PATCH] oestats-client.bbclass: send USERDISTRO value

[PATCH] oestats-client.bbclass: send USERDISTRO value

[Petr Štetiar]

With this patch it's now possible to see the correct Angstrom distro version
in the Tinderbox. Now the distribution value is always 'angstrom', with this
patch it would be more detailed version 'angstrom-2008.1' for example.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
 classes/oestats-client.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass
index 4415461..a98c9d1 100644
--- a/classes/oestats-client.bbclass
+++ b/classes/oestats-client.bbclass
@@ -77,7 +77,7 @@ def oestats_start(server, builder, d):
 			'metadata_branch': bb.data.getVar('METADATA_BRANCH', d, True),
 			'metadata_revision': bb.data.getVar('METADATA_REVISION', d, True),
 			'machine': bb.data.getVar('MACHINE', d, True),
-			'distro': bb.data.getVar('DISTRO', d, True),
+			'distro': bb.data.getVar('USERDISTRO', d, True),
 		})
 		if re.match("^\d+$", data): id=data
 	except:
-- 
1.7.0.4

Re: [PATCH] oestats-client.bbclass: send USERDISTRO value

[Frans Meulenbroeks]

2010/10/16 Petr Štetiar <ynezz@true.cz>:
> With this patch it's now possible to see the correct Angstrom distro version
> in the Tinderbox. Now the distribution value is always 'angstrom', with this
> patch it would be more detailed version 'angstrom-2008.1' for example.
>
> Signed-off-by: Petr Štetiar <ynezz@true.cz>
> ---
>  classes/oestats-client.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass
> index 4415461..a98c9d1 100644
> --- a/classes/oestats-client.bbclass
> +++ b/classes/oestats-client.bbclass
> @@ -77,7 +77,7 @@ def oestats_start(server, builder, d):
>                        'metadata_branch': bb.data.getVar('METADATA_BRANCH', d, True),
>                        'metadata_revision': bb.data.getVar('METADATA_REVISION', d, True),
>                        'machine': bb.data.getVar('MACHINE', d, True),
> -                       'distro': bb.data.getVar('DISTRO', d, True),
> +                       'distro': bb.data.getVar('USERDISTRO', d, True),
>                })
>                if re.match("^\d+$", data): id=data
>        except:
> --
> 1.7.0.4
>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

Re: [PATCH] oestats-client.bbclass: send USERDISTRO value

[Chris Larson]

On Sat, Oct 16, 2010 at 1:58 AM, Frans Meulenbroeks <
fransmeulenbroeks@gmail.com> wrote:

> > -                       'distro': bb.data.getVar('DISTRO', d, True),
> > +                       'distro': bb.data.getVar('USERDISTRO', d, True),
> >                })
> >                if re.match("^\d+$", data): id=data
> >        except:
> > --
> > 1.7.0.4
> >
> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>


Is USERDISTRO always guaranteed to be set, or should it fall back to DISTRO?
 (haven't checked, I feel lazy, sue me :)
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

Re: [PATCH] oestats-client.bbclass: send USERDISTRO value

[Petr Štetiar]

Chris Larson <clarson@kergoth.com> [2010-10-16 20:12:52]:

> Is USERDISTRO always guaranteed to be set, or should it fall back to DISTRO?
>  (haven't checked, I feel lazy, sue me :)

ynezz@ntbk:/media/data/devel/oe/ts72xx.git/openembedded/conf$ grep USERDISTRO . -R
./distro/include/kaeilos.inc:USERDISTRO := "${DISTRO}"
./distro/include/kaeilos-2010.inc:USERDISTRO := "${DISTRO}"
./distro/include/angstrom.inc:USERDISTRO := "${DISTRO}"
./bitbake.conf:# USERDISTRO should always contain original DISTRO value as set by user
./bitbake.conf:# overrides like it wants), USERDISTRO must be reassigned with := first
./bitbake.conf:USERDISTRO = "${DISTRO}"

-- ynezz

Re: [PATCH] oestats-client.bbclass: send USERDISTRO value

[Frans Meulenbroeks]

2010/10/17 Chris Larson <clarson@kergoth.com>:
> On Sat, Oct 16, 2010 at 1:58 AM, Frans Meulenbroeks <
> fransmeulenbroeks@gmail.com> wrote:
>
>> > -                       'distro': bb.data.getVar('DISTRO', d, True),
>> > +                       'distro': bb.data.getVar('USERDISTRO', d, True),
>> >                })
>> >                if re.match("^\d+$", data): id=data
>> >        except:
>> > --
>> > 1.7.0.4
>> >
>> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
>
>
> Is USERDISTRO always guaranteed to be set, or should it fall back to DISTRO?
>  (haven't checked, I feel lazy, sue me :)
> --

Yes, checked that, before I acked because I also had that concern.
It is done in bitbake.conf
see also the grep from Petr

Frans

Re: [PATCH] oestats-client.bbclass: send USERDISTRO value

[Petr Štetiar]

Frans Meulenbroeks <fransmeulenbroeks@gmail.com> [2010-10-17 12:56:32]:

> Yes, checked that, before I acked because I also had that concern.
> It is done in bitbake.conf see also the grep from Petr.

Can we get this in just before next testing? Thanks.

-- ynezz

Re: [PATCH] oestats-client.bbclass: send USERDISTRO value

[Frans Meulenbroeks]

2010/10/19 Petr Štetiar <ynezz@true.cz>:
> Frans Meulenbroeks <fransmeulenbroeks@gmail.com> [2010-10-17 12:56:32]:
>
>> Yes, checked that, before I acked because I also had that concern.
>> It is done in bitbake.conf see also the grep from Petr.
>
> Can we get this in just before next testing? Thanks.
>
> -- ynezz

I'm happy to push it when there is a 2nd ack.

Frans

Re: [PATCH] oestats-client.bbclass: send USERDISTRO value

[Chris Larson]

On Sat, Oct 16, 2010 at 1:58 AM, Frans Meulenbroeks <
fransmeulenbroeks@gmail.com> wrote:

> 2010/10/16 Petr Štetiar <ynezz@true.cz>:
> > With this patch it's now possible to see the correct Angstrom distro
> version
> > in the Tinderbox. Now the distribution value is always 'angstrom', with
> this
> > patch it would be more detailed version 'angstrom-2008.1' for example.
> >
> > Signed-off-by: Petr Štetiar <ynezz@true.cz>
> > ---
> >  classes/oestats-client.bbclass |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/classes/oestats-client.bbclass
> b/classes/oestats-client.bbclass
> > index 4415461..a98c9d1 100644
> > --- a/classes/oestats-client.bbclass
> > +++ b/classes/oestats-client.bbclass
> > @@ -77,7 +77,7 @@ def oestats_start(server, builder, d):
> >                        'metadata_branch':
> bb.data.getVar('METADATA_BRANCH', d, True),
> >                        'metadata_revision':
> bb.data.getVar('METADATA_REVISION', d, True),
> >                        'machine': bb.data.getVar('MACHINE', d, True),
> > -                       'distro': bb.data.getVar('DISTRO', d, True),
> > +                       'distro': bb.data.getVar('USERDISTRO', d, True),
> >                })
> >                if re.match("^\d+$", data): id=data
> >        except:
> > --
> > 1.7.0.4
> >
> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
>

Acked-by: Chris Larson <chris_larson@mentor.com>

-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

Re: [PATCH] oestats-client.bbclass: send USERDISTRO value

[Frans Meulenbroeks]

Pushed. Thanks!

Frans