summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 22:15:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 22:18:12 +0100
commit00c38774ef0232cc2be924ed8e59220e7c452096 (patch)
tree8302c4db0d89769460131de3a0ee7ce4eae81b99
parent751212d5effdceab91d95705e647cf07e6820940 (diff)
downloadopenembedded-core-00c38774ef0232cc2be924ed8e59220e7c452096.tar.gz
openembedded-core-00c38774ef0232cc2be924ed8e59220e7c452096.tar.bz2
openembedded-core-00c38774ef0232cc2be924ed8e59220e7c452096.tar.xz
openembedded-core-00c38774ef0232cc2be924ed8e59220e7c452096.zip
multilib.bbclass: Partially fix multlib image targets
This patch partially fixes problems when building multilib extended images such as libXX-core-image-minimal. Its not a perfect/complete solution but works much better than any previous code did. [YOCTO #1496] (partial) [YOCTO #1497] (partial) [YOCTO #1498] (partial) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/crosssdk.bbclass1
-rw-r--r--meta/classes/multilib.bbclass13
-rw-r--r--meta/classes/nativesdk.bbclass1
3 files changed, 15 insertions, 0 deletions
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass
index 5cfa43b3d..83753b4f7 100644
--- a/meta/classes/crosssdk.bbclass
+++ b/meta/classes/crosssdk.bbclass
@@ -18,6 +18,7 @@ target_includedir = "${SDKPATHNATIVE}${includedir_nativesdk}"
target_base_libdir = "${SDKPATHNATIVE}${base_libdir_nativesdk}"
target_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
target_exec_prefix = "${SDKPATHNATIVE}${exec_prefix_nativesdk}"
+baselib = "lib"
do_populate_sysroot[stamp-extra-info] = ""
do_package[stamp-extra-info] = ""
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 138dd27a6..98f69116b 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -11,6 +11,10 @@ python multilib_virtclass_handler () {
if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
+ if bb.data.inherits_class('image', e.data):
+ e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
+ return
+
save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
for name in save_var_name.split():
val=e.data.getVar(name, True)
@@ -48,6 +52,15 @@ python __anonymous () {
newdeps.append(multilib_extend_name(variant, dep))
d.setVar(varname, " ".join(newdeps))
+ if bb.data.inherits_class('image', d):
+ map_dependencies("PACKAGE_INSTALL", d)
+ pinstall = d.getVar("PACKAGE_INSTALL", True) + " " + d.getVar("MULTILIB_PACKAGE_INSTALL", False)
+ d.setVar("MULTILIB_PACKAGE_INSTALL", pinstall)
+ d.setVar("PACKAGE_INSTALL", "")
+ # FIXME, we need to map this to something, not delete it!
+ d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "")
+ return
+
pkgs_mapping = []
for pkg in (d.getVar("PACKAGES", True) or "").split():
if pkg.startswith(variant):
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index a495555b3..bb59ac57a 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -48,6 +48,7 @@ LDFLAGS = "${BUILDSDK_LDFLAGS}"
base_prefix = "${SDKPATHNATIVE}"
prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
+baselib = "lib"
FILES_${PN} += "${prefix}"
FILES_${PN}-dbg += "${prefix}/.debug \