[3/5] multilib: set NO_MULTILIB for kernel recipes
Submitted by Dongxiao Xu on Sept. 2, 2011, 9:03 a.m.
|
Patch ID: 10893
Details
Commit Message
@@ -9,6 +9,7 @@ INHIBIT_DEFAULT_DEPS = "1"
KERNEL_IMAGETYPE ?= "zImage"
INITRAMFS_IMAGE ?= ""
INITRAMFS_TASK ?= ""
+NO_MULTILIB = "1"
python __anonymous () {
kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or ''
@@ -6,6 +6,11 @@ python multilib_virtclass_handler () {
variant = e.data.getVar("BBEXTENDVARIANT", True)
if cls != "multilib" or not variant:
return
+
+ if e.data.getVar("NO_MULTILIB", True) == "1":
+ bb.warn("NO_MULTILIB is set for %s, using the default instead." % e.data.getVar("PN", True))
+ 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)
@@ -28,7 +33,13 @@ STAGINGCC_prepend = "${BBEXTENDVARIANT}-"
python __anonymous () {
variant = d.getVar("BBEXTENDVARIANT", True)
+ if d.getVar("NO_MULTILIB", True) == "1":
+ bb.warn("NO_MULTILIB is set for %s, using the default instead." % d.getVar("PN", True))
+ return
+
def extend_name(name):
+ if name == "virtual/kernel" or name.startswith("kernel-module"):
+ return name
if name.startswith("virtual/"):
subs = name.split("/", 1)[1]
if not subs.startswith(variant):
@@ -237,7 +237,6 @@ BBCLASSEXTEND_append_pn-libxxf86vm = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-libzypp = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-lighttpd = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-linux-libc-headers = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-linux-yocto = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-logrotate = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-lrzsz = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-lsb = " ${MULTILIBS}"