From: Robert Yang <liezhi.yang@windriver.com>
Date: Wed, 6 Nov 2024 14:05:20 +0000 (-0800)
Subject: multilib_global.bbclass: Avoid expanding native recipes in NON_MULTILIB_RECIPES
X-Git-Tag: yocto-5.2~1389
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73bea15bb5d0f70b587d2ad1007cc0282652eed7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

multilib_global.bbclass: Avoid expanding native recipes in NON_MULTILIB_RECIPES

Fixed:
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
MACHINE = "qemux86-64"

$ bitbake lib32-grub-native
The build would go on before the patch which was incorrect. Now:

ERROR: Nothing PROVIDES 'lib32-grub-native'. Close matches:
[snip]

The nativesdk doesn't have such an issue, so only skip native.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 973ac9130b1..c95c3a586d3 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -184,6 +184,9 @@ python multilib_virtclass_handler_global () {
     if variant:
         return
 
+    if bb.data.inherits_class('native', d):
+        return
+
     non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split()
 
     if bb.data.inherits_class('kernel', d) or \