* [PATCH 0/1] Don't expand vars which starts with multilib prefix already
@ 2015-11-13 9:24 kai.kang
2015-11-13 9:24 ` [PATCH 1/1] toolchain-scripts.bbclass: do not expand vars which starts with multilib prefixes kai.kang
2015-12-03 1:54 ` [PATCH 0/1] Don't expand vars which starts with multilib prefix already Kang Kai
0 siblings, 2 replies; 4+ messages in thread
From: kai.kang @ 2015-11-13 9:24 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Test steps:
1 set MACHINE and multilibs in local.conf
===============================================
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32 multilib:lib64"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
DEFAULTTUNE_virtclass-multilib-lib64 = "x86-64"
===============================================
2 bitbake lib64-meta-ide-support core-image-sato
The following changes since commit fc45deac89ef63ca1c44e763c38ced7dfd72cbe1:
build-appliance-image: Update to jethro head revision (2015-11-03 14:03:03 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib kangkai/multilib
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/multilib
Kai Kang (1):
toolchain-scripts.bbclass: do not expand vars which starts with
multilib prefixes
meta/classes/toolchain-scripts.bbclass | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
--
2.6.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/1] toolchain-scripts.bbclass: do not expand vars which starts with multilib prefixes
2015-11-13 9:24 [PATCH 0/1] Don't expand vars which starts with multilib prefix already kai.kang
@ 2015-11-13 9:24 ` kai.kang
2015-12-03 1:54 ` [PATCH 0/1] Don't expand vars which starts with multilib prefix already Kang Kai
1 sibling, 0 replies; 4+ messages in thread
From: kai.kang @ 2015-11-13 9:24 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
When set MULTILIBS with two or more items, such as
MULTILIBS = "multilib:lib32 multilib:lib64"
It expands depends once in mutlib.bbclass, and expand again in
toolchain-scripts.bbclass that causes error:
| ERROR: Nothing PROVIDES 'virtual/lib32-lib64-libc'.
Check before expand a var. If starts with a multilib prefix, ignore it.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/classes/toolchain-scripts.bbclass | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index d0b2b91..3878a42 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -146,7 +146,17 @@ python __anonymous () {
deps = ""
for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split():
deps += " %s:do_populate_sysroot" % dep
- for variant in (d.getVar('MULTILIB_VARIANTS', True) or "").split():
+
+ ml_variants = (d.getVar('MULTILIB_VARIANTS', True) or "").split()
+ extended = False
+ for variant in ml_variants:
+ if dep.startswith(variant) or dep.startswith('virtual/' + variant):
+ extended = True
+ break
+ if extended:
+ continue
+
+ for variant in ml_variants:
clsextend = oe.classextend.ClassExtender(variant, d)
newdep = clsextend.extend_name(dep)
deps += " %s:do_populate_sysroot" % newdep
--
2.6.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/1] Don't expand vars which starts with multilib prefix already
2015-11-13 9:24 [PATCH 0/1] Don't expand vars which starts with multilib prefix already kai.kang
2015-11-13 9:24 ` [PATCH 1/1] toolchain-scripts.bbclass: do not expand vars which starts with multilib prefixes kai.kang
@ 2015-12-03 1:54 ` Kang Kai
2016-01-25 7:54 ` Kang Kai
1 sibling, 1 reply; 4+ messages in thread
From: Kang Kai @ 2015-12-03 1:54 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
On 2015年11月13日 17:24, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> Test steps:
> 1 set MACHINE and multilibs in local.conf
>
> ===============================================
> MACHINE = "qemux86-64"
>
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32 multilib:lib64"
> DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
> DEFAULTTUNE_virtclass-multilib-lib64 = "x86-64"
> ===============================================
>
> 2 bitbake lib64-meta-ide-support core-image-sato
>
> The following changes since commit fc45deac89ef63ca1c44e763c38ced7dfd72cbe1:
>
> build-appliance-image: Update to jethro head revision (2015-11-03 14:03:03 +0000)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib kangkai/multilib
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/multilib
>
> Kai Kang (1):
> toolchain-scripts.bbclass: do not expand vars which starts with
> multilib prefixes
>
> meta/classes/toolchain-scripts.bbclass | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
Ping.
--
Regards,
Neil | Kai Kang
[-- Attachment #2: Type: text/html, Size: 1930 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-25 7:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-13 9:24 [PATCH 0/1] Don't expand vars which starts with multilib prefix already kai.kang
2015-11-13 9:24 ` [PATCH 1/1] toolchain-scripts.bbclass: do not expand vars which starts with multilib prefixes kai.kang
2015-12-03 1:54 ` [PATCH 0/1] Don't expand vars which starts with multilib prefix already Kang Kai
2016-01-25 7:54 ` Kang Kai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox