Re: [OE-core][PATCH 2/2] kernel.bbclass: inherit kernel_devicetree only if KERNEL_DEVICETREE is set

On Wed, Jun 23, 2021 at 11:32 AM Peter Kjellerstedt
[off-list ref] wrote:

quoted

-----Original Message-----
From: openembedded-core@lists.openembedded.org <openembedded-
core@lists.openembedded.org> On Behalf Of Andrea Adami
Sent: den 23 juni 2021 00:18
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][PATCH 2/2] kernel.bbclass: inherit kernel_devicetree
only if KERNEL_DEVICETREE is set

Now it unconditionally tries to create package kernel-devicetre even for
legacy devices w/out DT.

Signed-off-by: Andrea Adami <redacted>
---
 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 06e6446a08..68369e3791 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass

@@ -779,4 +779,4 @@ addtask deploy after do_populate_sysroot

do_packagedata
 EXPORT_FUNCTIONS do_deploy

 # Add using Device Tree support
-inherit kernel-devicetree
+inherit ${@ "" if d.getVar("KERNEL_DEVICETREE" == "") else "kernel-devicetree" }

That doesn't look correct. Don't you mean something like this:

inherit ${@ "kernel-devicetree" if d.getVar("KERNEL_DEVICETREE") else "" }

As you prefer, I don't think bitbake has likely/unlikely optimization.
I took the style-example from line 6 where it reads

KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") ==
"kernel") else d.getVar("KERNEL_PACKAGE_NAME") }"

I am for any option providing a guard.

Cheers
A.A.

quoted

--
2.17.1

//Peter