Patchwork [v2,2/2] classes/multilib: prevent multilib extension of nativesdk recipes

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 22, 2012, 12:29 p.m.
Message ID <29c686d2d3a1f87254d62226b0e6b30d58005986.1348316945.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/37033/
State Accepted
Commit d9a1eb5054d487affb94431374a9cb1a735e2122
Headers show

Comments

Paul Eggleton - Sept. 22, 2012, 12:29 p.m.
It isn't supported to mix multilib and nativesdk in the same target, so
explicitly skip multilib processing if nativesdk is inherited. As a
bonus this fixes a bunch of related "missing file" warnings from the
file checksum code during parsing because BPN was not correctly stripped
for these targets.

Second half of the fix for [YOCTO #3146].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/multilib.bbclass |    3 +++
 1 file changed, 3 insertions(+)
Khem Raj - Sept. 22, 2012, 6:28 p.m.
On Sat, Sep 22, 2012 at 5:29 AM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> It isn't supported to mix multilib and nativesdk in the same target, so
> explicitly skip multilib processing if nativesdk is inherited. As a
> bonus this fixes a bunch of related "missing file" warnings from the
> file checksum code during parsing because BPN was not correctly stripped
> for these targets.
>
> Second half of the fix for [YOCTO #3146].
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Tested-by: Khem Raj <raj.khem@gmail.com>

> ---
>  meta/classes/multilib.bbclass |    3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> index 4d3f889..7d5fc41 100644
> --- a/meta/classes/multilib.bbclass
> +++ b/meta/classes/multilib.bbclass
> @@ -19,6 +19,9 @@ python multilib_virtclass_handler () {
>      if bb.data.inherits_class('native', e.data):
>          raise bb.parse.SkipPackage("We can't extend native recipes")
>
> +    if bb.data.inherits_class('nativesdk', e.data):
> +        raise bb.parse.SkipPackage("We can't extend nativesdk recipes")
> +
>      save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
>      for name in save_var_name.split():
>          val=e.data.getVar(name, True)
> --
> 1.7.9.5
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 4d3f889..7d5fc41 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -19,6 +19,9 @@  python multilib_virtclass_handler () {
     if bb.data.inherits_class('native', e.data):
         raise bb.parse.SkipPackage("We can't extend native recipes")
 
+    if bb.data.inherits_class('nativesdk', e.data):
+        raise bb.parse.SkipPackage("We can't extend nativesdk recipes")
+
     save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
     for name in save_var_name.split():
         val=e.data.getVar(name, True)