Skip to contentSkip to conversation

multilib.bbclass: Expand the WHITELISTs with multilib prefix

PATCH In review [email protected] 2 participants 4 messages Aug 2, 2013 – Aug 28, 2013

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover multilib.bbclass: Expand the WHITELISTs with multilib prefix

From: Jackie Huang <[email protected]>

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(-)
Signature · 1 line
1.7.4.1
author
#1 lore raw

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

From: Jackie Huang <[email protected]>

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 <[email protected]>
---
 meta/classes/multilib.bbclass |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
meta/classes/multilib.bbclass +7 -0
index b04825f..dac160e 100644
@@ -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:
Signature · 1 line
1.7.4.1
author
#2 lore raw
In reply to [email protected]

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

Thanks,
Jackie

Quoted 23 lines · On 8/2/2013 5:46 PM, [email protected] wrote:

From: Jackie Huang <[email protected]>

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(-)
Signature · 5 lines
Jackie Huang
WIND RIVER | China Development Center
MSN:[email protected]
Tel: +86 8477 8594
Mobile: +86 138 1027 4745
#3 lore raw
Quoted 2 lines · 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

Quoted 28 lines

Thanks,
Jackie

Quoted 23 lines · On 8/2/2013 5:46 PM, [email protected] wrote:

From: Jackie Huang <[email protected]>

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(-)