summaryrefslogtreecommitdiffstats
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:54:04 +0100
commit976f69ff1bd0d4711cc43276497a3b852051f1b5 (patch)
tree63b4bbfc6e78e42dc38baea25c3d56bf19634997
parent0f6ea144a7a28e3971cf28ae175d6bd4f59d07fe (diff)
downloadpoky-976f69ff1bd0d4711cc43276497a3b852051f1b5.tar.gz
poky-976f69ff1bd0d4711cc43276497a3b852051f1b5.tar.bz2
poky-976f69ff1bd0d4711cc43276497a3b852051f1b5.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. (From OE-Core rev: 685a3f7d3df9ae8bba7d1d20b6476db81dc75334) 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)