[PATCH 1/1] linux-distro: Fix check for native or compat override

[PATCH 1/1] linux-distro: Fix check for native or compat override

['Felix Moessbauer' via isar-users]

We must not inject the stubs on compat or native, as otherwise we get
the multiple providers warning. Commit 367c5d99 tried to fix this, but
used incorrect Python syntax to express the condition. By that, only the
class-native was excluded, but not compat.

Fixes: 367c5d99 ("linux-distro: Fix multiple provider warnings")
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/recipes-kernel/linux/linux-distro.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux/linux-distro.bb b/meta/recipes-kernel/linux/linux-distro.bb
index 638ad65a..8fc1bcb7 100644
--- a/meta/recipes-kernel/linux/linux-distro.bb
+++ b/meta/recipes-kernel/linux/linux-distro.bb
@@ -6,7 +6,8 @@
 # SPDX-License-Identifier: MIT
 
 python() {
-    if ("class-native" or "class-compat") in d.getVar("OVERRIDES").split(":"):
+    overrides = d.getVar("OVERRIDES").split(":")
+    if any(o in overrides for o in ("class-native", "class-compat")):
         return
 
     distro_kernels = d.getVar('DISTRO_KERNELS') or ""
-- 
2.53.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260527122221.1477287-1-felix.moessbauer%40siemens.com.

Re: [PATCH 1/1] linux-distro: Fix check for native or compat override

['Jan Kiszka' via isar-users]

On 27.05.26 14:22, Felix Moessbauer wrote:
> We must not inject the stubs on compat or native, as otherwise we get
> the multiple providers warning. Commit 367c5d99 tried to fix this, but
> used incorrect Python syntax to express the condition. By that, only the
> class-native was excluded, but not compat.
> 
> Fixes: 367c5d99 ("linux-distro: Fix multiple provider warnings")
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta/recipes-kernel/linux/linux-distro.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-kernel/linux/linux-distro.bb b/meta/recipes-kernel/linux/linux-distro.bb
> index 638ad65a..8fc1bcb7 100644
> --- a/meta/recipes-kernel/linux/linux-distro.bb
> +++ b/meta/recipes-kernel/linux/linux-distro.bb
> @@ -6,7 +6,8 @@
>  # SPDX-License-Identifier: MIT
>  
>  python() {
> -    if ("class-native" or "class-compat") in d.getVar("OVERRIDES").split(":"):
> +    overrides = d.getVar("OVERRIDES").split(":")
> +    if any(o in overrides for o in ("class-native", "class-compat")):
>          return
>  
>      distro_kernels = d.getVar('DISTRO_KERNELS') or ""

Well, yeah, "obviously".

Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>

Jan

-- 
Siemens AG, Foundational Technologies
Linux Expert Center

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/b4125acd-d091-472b-a320-39a20f6cd79d%40siemens.com.