aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-06 11:06:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-08 23:53:56 +0100
commit685a3f7d3df9ae8bba7d1d20b6476db81dc75334 (patch)
tree82cbc6bf27c5b9295859468fb2415b8a15e2d017
parent8261f9da2fd9db4d020eb80f44e39cc0f79518c5 (diff)
downloadopenembedded-core-685a3f7d3df9ae8bba7d1d20b6476db81dc75334.tar.gz
openembedded-core-685a3f7d3df9ae8bba7d1d20b6476db81dc75334.tar.bz2
openembedded-core-685a3f7d3df9ae8bba7d1d20b6476db81dc75334.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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 f405b6e523..b03a286ed4 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)