[PATCH 1/1] toaster: add buildstats to toaster config file

[PATCH 1/1] toaster: add buildstats to toaster config file

[Alex DAMIAN]

From: Alexandru DAMIAN <alexandru.damian@intel.com>

Toaster needs buildstats to be enabled in order to
be able to collect task running stats. This patch
adds buildstats to the running configuration in toaster mode.

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
---
 bin/toaster | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/toaster b/bin/toaster
index 38e71ac..d6c3175 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -61,10 +61,13 @@ function webserverStartAll()
 }
 
 # Helper functions to add a special configuration file
+function initConfiguration()
+{
+        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$1
+}
 
 function addtoConfiguration()
 {
-        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$2
         echo $1 >> ${BUILDDIR}/conf/$2
 }
 
@@ -167,7 +170,9 @@ fi
 case $CMD in
     start )
         start_success=1
+        initConfiguration toaster.conf
         addtoConfiguration "INHERIT+=\"toaster buildhistory\"" toaster.conf
+        addtoConfiguration "USER_CLASSES+=\"buildstats\"" toaster.conf
         if ! webserverStartAll; then
             echo "Failed ${CMD}."
             return 4
-- 
1.8.3.2

Re: [PATCH 1/1] toaster: add buildstats to toaster config file

[Richard Purdie]

On Wed, 2013-12-18 at 19:26 +0000, Alex DAMIAN wrote:
> From: Alexandru DAMIAN <alexandru.damian@intel.com>
> 
> Toaster needs buildstats to be enabled in order to
> be able to collect task running stats. This patch
> adds buildstats to the running configuration in toaster mode.
> 
> Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
> ---
>  bin/toaster | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/bin/toaster b/bin/toaster
> index 38e71ac..d6c3175 100755
> --- a/bin/toaster
> +++ b/bin/toaster
> @@ -61,10 +61,13 @@ function webserverStartAll()
>  }
>  
>  # Helper functions to add a special configuration file
> +function initConfiguration()
> +{
> +        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$1
> +}
>  
>  function addtoConfiguration()
>  {
> -        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$2
>          echo $1 >> ${BUILDDIR}/conf/$2
>  }
>  
> @@ -167,7 +170,9 @@ fi
>  case $CMD in
>      start )
>          start_success=1
> +        initConfiguration toaster.conf
>          addtoConfiguration "INHERIT+=\"toaster buildhistory\"" toaster.conf
> +        addtoConfiguration "USER_CLASSES+=\"buildstats\"" toaster.conf
>          if ! webserverStartAll; then
>              echo "Failed ${CMD}."
>              return 4

Why not just add this to the INHERIT? I'm trying to figure out if
USER_CLASSES is special in some way and when we should use one and when
we should use the other...

Cheers,

Richard

Re: [PATCH 1/1] toaster: add buildstats to toaster config file

[Damian, Alexandru]

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

Just now saw this email - sorry for the delay,

I used USER_CLASSES just because this is how it's enabled in the default
local.conf ...

Alex


On Thu, Dec 19, 2013 at 9:21 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Wed, 2013-12-18 at 19:26 +0000, Alex DAMIAN wrote:
> > From: Alexandru DAMIAN <alexandru.damian@intel.com>
> >
> > Toaster needs buildstats to be enabled in order to
> > be able to collect task running stats. This patch
> > adds buildstats to the running configuration in toaster mode.
> >
> > Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
> > ---
> >  bin/toaster | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/bin/toaster b/bin/toaster
> > index 38e71ac..d6c3175 100755
> > --- a/bin/toaster
> > +++ b/bin/toaster
> > @@ -61,10 +61,13 @@ function webserverStartAll()
> >  }
> >
> >  # Helper functions to add a special configuration file
> > +function initConfiguration()
> > +{
> > +        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$1
> > +}
> >
> >  function addtoConfiguration()
> >  {
> > -        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$2
> >          echo $1 >> ${BUILDDIR}/conf/$2
> >  }
> >
> > @@ -167,7 +170,9 @@ fi
> >  case $CMD in
> >      start )
> >          start_success=1
> > +        initConfiguration toaster.conf
> >          addtoConfiguration "INHERIT+=\"toaster buildhistory\""
> toaster.conf
> > +        addtoConfiguration "USER_CLASSES+=\"buildstats\"" toaster.conf
> >          if ! webserverStartAll; then
> >              echo "Failed ${CMD}."
> >              return 4
>
> Why not just add this to the INHERIT? I'm trying to figure out if
> USER_CLASSES is special in some way and when we should use one and when
> we should use the other...
>
> Cheers,
>
> Richard
>
>
>


-- 
Alex Damian
Yocto Project
SSG / OTC

[-- Attachment #2: Type: text/html, Size: 2909 bytes --]