[OE-core][dunfell 09/19] kernel: Fix interaction when packaging disabled
From: Steve Sakoman <hidden>
Date: 2021-07-05 22:36:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Richard Purdie <redacted> 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 <redacted> (cherry picked from commit 2522daf22e2c27dd9c7926feda0345978217c6c3) Signed-off-by: Steve Sakoman <redacted> --- meta/classes/kernel.bbclass | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 85c6594c27..2a3cb21fc0 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass@@ -91,6 +91,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)
--
2.25.1