1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index de6e59e39d..c249925441 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -28,7 +28,7 @@ python multilib_virtclass_handler () {
    if bb.data.inherits_class('native', e.data):
        raise bb.parse.SkipPackage("We can't extend native recipes")
-    if bb.data.inherits_class('nativesdk', e.data):
+    if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
        raise bb.parse.SkipPackage("We can't extend nativesdk recipes")
    save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
@@ -101,7 +101,7 @@ python do_package_qa_multilib() {
        for i in values:
            if i.startswith('virtual/'):
                i = i[len('virtual/'):]
-            if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and (not 'cross-canadian' in i):
+            if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and (not 'cross-canadian' in i) and (not i.startswith("nativesdk-")):
                candidates.append(i)
        if len(candidates) > 0:
            bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s"

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index de6e59e39d..c249925441 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass
@@ -28,7 +28,7 @@ python multilib_virtclass_handler () {
28	if bb.data.inherits_class('native', e.data):	28	if bb.data.inherits_class('native', e.data):
29	raise bb.parse.SkipPackage("We can't extend native recipes")	29	raise bb.parse.SkipPackage("We can't extend native recipes")
30		30
31	if bb.data.inherits_class('nativesdk', e.data):	31	if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
32	raise bb.parse.SkipPackage("We can't extend nativesdk recipes")	32	raise bb.parse.SkipPackage("We can't extend nativesdk recipes")
33		33
34	save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""	34	save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
@@ -101,7 +101,7 @@ python do_package_qa_multilib() {
101	for i in values:	101	for i in values:
102	if i.startswith('virtual/'):	102	if i.startswith('virtual/'):
103	i = i[len('virtual/'):]	103	i = i[len('virtual/'):]
104	if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and (not 'cross-canadian' in i):	104	if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and (not 'cross-canadian' in i) and (not i.startswith("nativesdk-")):
105	candidates.append(i)	105	candidates.append(i)
106	if len(candidates) > 0:	106	if len(candidates) > 0:
107	bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s"	107	bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s"