[PATCH 0/1] multilib.bbclass: Expand the WHITELISTs with multilib prefix

[PATCH 0/1] multilib.bbclass: Expand the WHITELISTs with multilib prefix

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Tested with:
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
INCOMPATIBLE_LICENSE = "GPLv3"

--
The following changes since commit f192c444c2d88c49738bea4ff4c3af0cc72916de:

  texinfo: Update to 5.1 (2013-07-31 06:56:28 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib jhuang0/d_gplv3_0801_2
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_gplv3_0801_2

Jackie Huang (1):
  multilib.bbclass: Expand the WHITELISTs with multilib prefix

 meta/classes/multilib.bbclass |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

-- 
1.7.4.1

[PATCH 1/1] multilib.bbclass: Expand the WHITELISTs with multilib prefix

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

fix the following failures:
ERROR: Nothing PROVIDES 'virtual/lib32-i586-pokymllib32-linux-compilerlibs'
ERROR: Nothing RPROVIDES 'lib32-update-alternatives-cworth'

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/classes/multilib.bbclass |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index b04825f..dac160e 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -50,6 +50,13 @@ python multilib_virtclass_handler () {
     e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
     e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
 
+    # Expand the WHITELISTs with multilib prefix
+    for whitelist in ["HOSTTOOLS_WHITELIST_GPLv3", "WHITELIST_GPLv3", "LGPLv2_WHITELIST_GPLv3"]:
+        pkgs = e.data.getVar(whitelist, True)
+        for pkg in pkgs.split():
+            pkgs += " " + variant + "-" + pkg
+        e.data.setVar(whitelist, pkgs)
+
     # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data
     newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False)
     if newtune:
-- 
1.7.4.1

Re: [PATCH 0/1] multilib.bbclass: Expand the WHITELISTs with multilib prefix

[jhuang0]

Could anyone look at this? It's been a long time here, but no comments 
and is not merged yet.

Thanks,
Jackie

On 8/2/2013 5:46 PM, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> Tested with:
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32"
> DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
> INCOMPATIBLE_LICENSE = "GPLv3"
>
> --
> The following changes since commit f192c444c2d88c49738bea4ff4c3af0cc72916de:
>
>    texinfo: Update to 5.1 (2013-07-31 06:56:28 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib jhuang0/d_gplv3_0801_2
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_gplv3_0801_2
>
> Jackie Huang (1):
>    multilib.bbclass: Expand the WHITELISTs with multilib prefix
>
>   meta/classes/multilib.bbclass |    7 +++++++
>   1 files changed, 7 insertions(+), 0 deletions(-)
>

-- 
Jackie Huang
WIND RIVER | China Development Center
MSN:jackielily@hotmail.com
Tel: +86 8477 8594
Mobile: +86 138 1027 4745

Re: [PATCH 0/1] multilib.bbclass: Expand the WHITELISTs with multilib prefix

[Mark Hatle]

On 8/27/13 2:32 AM, jhuang0 wrote:
> Could anyone look at this? It's been a long time here, but no comments
> and is not merged yet.

This is definitely still needed in oe-core.  Without this the license 
whitelist/blacklist doesn't work as expected when multilibs are enabled.

The only alternative would be to change where the whitelist/blacklist is 
evaluated to look for the version w/o the multilib name.  But I don't believe 
that can be done easily (or perhaps at all.)

--Mark

> Thanks,
> Jackie
>
> On 8/2/2013 5:46 PM, jackie.huang@windriver.com wrote:
>> From: Jackie Huang <jackie.huang@windriver.com>
>>
>> Tested with:
>> require conf/multilib.conf
>> MULTILIBS = "multilib:lib32"
>> DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
>> INCOMPATIBLE_LICENSE = "GPLv3"
>>
>> --
>> The following changes since commit f192c444c2d88c49738bea4ff4c3af0cc72916de:
>>
>>     texinfo: Update to 5.1 (2013-07-31 06:56:28 +0100)
>>
>> are available in the git repository at:
>>     git://git.pokylinux.org/poky-contrib jhuang0/d_gplv3_0801_2
>>     http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_gplv3_0801_2
>>
>> Jackie Huang (1):
>>     multilib.bbclass: Expand the WHITELISTs with multilib prefix
>>
>>    meta/classes/multilib.bbclass |    7 +++++++
>>    1 files changed, 7 insertions(+), 0 deletions(-)
>>
>