From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 26 Jun 2021 19:21:41 +0000 (+0100)
Subject: kernel: Fix interaction when packaging disabled
X-Git-Tag: uninative-3.3~361
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2522daf22e2c27dd9c7926feda0345978217c6c3;p=openembedded-core.git

kernel: Fix interaction when packaging disabled

When packaging is disabled using the nopackages class, ensure we don't
add to PACKAGES. This fixes builds where we have an unpackaged kernel
alongside a packaged kernel.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 379bed44f2..846b19663b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -92,6 +92,8 @@ python __anonymous () {
     imagedest = d.getVar('KERNEL_IMAGEDEST')
 
     for type in types.split():
+        if bb.data.inherits_class('nopackages', d):
+            continue
         typelower = type.lower()
         d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
         d.setVar('FILES_' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)