aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-26 20:21:41 +0100
committerAnuj Mittal <anuj.mittal@intel.com>2021-09-02 12:41:12 +0800
commitb8f81d137798fd48eaf7dc2ec6d9c98f712709a6 (patch)
tree82cbc6bf27c5b9295859468fb2415b8a15e2d017
parentc2caf2a775f9493fa3d86521daf477e8b20da37b (diff)
downloadopenembedded-core-contrib-b8f81d137798fd48eaf7dc2ec6d9c98f712709a6.tar.gz
openembedded-core-contrib-b8f81d137798fd48eaf7dc2ec6d9c98f712709a6.tar.bz2
openembedded-core-contrib-b8f81d137798fd48eaf7dc2ec6d9c98f712709a6.zip
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> (cherry picked from commit 2522daf22e2c27dd9c7926feda0345978217c6c3) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--meta/classes/kernel.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index f405b6e523b..b03a286ed44 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -90,6 +90,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)