From 10b39fb94bd35c5c9cf858d1d638b243511edfd1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 26 Jun 2021 20:21:41 +0100 Subject: 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. (From OE-Core rev: 2522daf22e2c27dd9c7926feda0345978217c6c3) Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/classes/kernel.bbclass') 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) -- cgit v1.2.3-54-g00ecf