Patchwork [2/2] default-distrovars: update license whitelists to use canonical names

login
register
mail settings
Submitter Ross Burton
Date July 16, 2014, 9:08 p.m.
Message ID <934289b8ba6a8b7a0f1eec8aabf723f823d515d8.1405542583.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/75831/
State New
Headers show

Comments

Ross Burton - July 16, 2014, 9:08 p.m.
Now that all licenses are canonicalised to SPDX names when processing, we need
to rename the whitelists to the match.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/conf/distro/include/default-distrovars.inc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Saul Wold - July 18, 2014, 10:35 p.m.
On 07/16/2014 02:08 PM, Ross Burton wrote:
> Now that all licenses are canonicalised to SPDX names when processing, we need
> to rename the whitelists to the match.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/conf/distro/include/default-distrovars.inc |    6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
> index 1bc8e46..8d24d66 100644
> --- a/meta/conf/distro/include/default-distrovars.inc
> +++ b/meta/conf/distro/include/default-distrovars.inc
> @@ -23,9 +23,9 @@ IMAGE_FEATURES ?= ""
>
>   # This is a list of packages that are used by the build system to build the distribution, they are not
>   # directly part of the distribution.
> -HOSTTOOLS_WHITELIST_GPLv3 ?= ""
> -WHITELIST_GPLv3 ?= "less"
> -LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime"
> +HOSTTOOLS_WHITELIST_GPL-3.0 ?= ""
> +WHITELIST_GPL-3.0 ?= "less"
> +LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime"
>

This change seems to make multilib builds unhappy, both on the 
Autobuilder and locally, see attached output.

Sau!

>   COMMERCIAL_AUDIO_PLUGINS ?= ""
>   # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
>
Parsing recipes...ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xaa61110>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xc2d9bd0>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x2eec3d0>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Unable to parse /srv/ssd/poky/meta-yocto/recipes-core/tiny-init/tiny-init.bb
Traceback (most recent call last):
  File "/srv/ssd/poky/bitbake/lib/bb/parse/ast.py", line 320, in finalize(fn='/srv/ssd/poky/meta-yocto/recipes-core/tiny-init/tiny-init.bb', d=<bb.data_smart.DataSmart object at 0x4eb9690>, variant='multilib:lib32'):
     
    >    bb.event.fire(bb.event.RecipePreFinalise(fn), d)
     
  File "/srv/ssd/poky/bitbake/lib/bb/event.py", line 158, in fire(event=<bb.event.RecipePreFinalise object at 0xaa61110>, d=<bb.data_smart.DataSmart object at 0x4eb9690>):
     
    >    fire_class_handlers(event, d)
         if worker_fire:
  File "/srv/ssd/poky/bitbake/lib/bb/event.py", line 97, in fire_class_handlers(event=<bb.event.RecipePreFinalise object at 0xaa61110>, d=<bb.data_smart.DataSmart object at 0x4eb9690>):
             if name in _catchall_handlers or name in evt_hmap:
    >            execute_handler(name, handler, event, d)
     
  File "/srv/ssd/poky/bitbake/lib/bb/event.py", line 74, in execute_handler(name='multilib_virtclass_handler', handler=<function multilib_virtclass_handler at 0x2eff140>, event=<bb.event.RecipePreFinalise object at 0xaa61110>, d=<bb.data_smart.DataSmart object at 0x4eb9690>):
         try:
    >        ret = handler(event)
         except (bb.parse.SkipRecipe, bb.BBHandledException):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xaa61110>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x92ef390>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xa0bdb10>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xa704050>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x251b110>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xc2bf550>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x9fa5c10>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x251b110>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xc2d00d0>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xc2d9150>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x92efc90>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x2ede8d0>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xc2d0ed0>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x4eccd90>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x4eb9c10>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x2eecb10>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x9205fd0>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xc2eab10>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x92ef650>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x2ed4c90>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x251b110>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x92efad0>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0xc2e6510>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x2ede890>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x9b6f390>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x920a850>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x9d6e590>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x4eb4f10>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x2edea90>)
AttributeError: 'NoneType' object has no attribute 'split'

ERROR: Execution of event handler 'multilib_virtclass_handler' failed
Traceback (most recent call last):
  File "multilib_virtclass_handler(e)", line 55, in multilib_virtclass_handler(e=<bb.event.RecipePreFinalise object at 0x2ee7d90>)
AttributeError: 'NoneType' object has no attribute 'split'


Summary: There were 33 ERROR messages shown, returning a non-zero exit code.
Richard Purdie - July 18, 2014, 11:15 p.m.
On Fri, 2014-07-18 at 15:35 -0700, Saul Wold wrote:
> On 07/16/2014 02:08 PM, Ross Burton wrote:
> > Now that all licenses are canonicalised to SPDX names when processing, we need
> > to rename the whitelists to the match.
> >
> > Signed-off-by: Ross Burton <ross.burton@intel.com>
> > ---
> >   meta/conf/distro/include/default-distrovars.inc |    6 +++---
> >   1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
> > index 1bc8e46..8d24d66 100644
> > --- a/meta/conf/distro/include/default-distrovars.inc
> > +++ b/meta/conf/distro/include/default-distrovars.inc
> > @@ -23,9 +23,9 @@ IMAGE_FEATURES ?= ""
> >
> >   # This is a list of packages that are used by the build system to build the distribution, they are not
> >   # directly part of the distribution.
> > -HOSTTOOLS_WHITELIST_GPLv3 ?= ""
> > -WHITELIST_GPLv3 ?= "less"
> > -LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime"
> > +HOSTTOOLS_WHITELIST_GPL-3.0 ?= ""
> > +WHITELIST_GPL-3.0 ?= "less"
> > +LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime"
> >
> 
> This change seems to make multilib builds unhappy, both on the 
> Autobuilder and locally, see attached output.

FWIW I've fixed this before I merged it, it needed a tweak to
multilib.bbclass...

Cheers,

Richard

Patch

diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 1bc8e46..8d24d66 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -23,9 +23,9 @@  IMAGE_FEATURES ?= ""
 
 # This is a list of packages that are used by the build system to build the distribution, they are not
 # directly part of the distribution. 
-HOSTTOOLS_WHITELIST_GPLv3 ?= ""
-WHITELIST_GPLv3 ?= "less"
-LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime" 
+HOSTTOOLS_WHITELIST_GPL-3.0 ?= ""
+WHITELIST_GPL-3.0 ?= "less"
+LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime"
 
 COMMERCIAL_AUDIO_PLUGINS ?= ""
 # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"