summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-26 20:21:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-06 13:02:30 +0100
commit47bb92e51c858a96e3221849f8a663f7e8675f23 (patch)
treecbd54af35151f2035557b22db339108660c4b071 /meta
parent175cf0be148455a7fcc9a6885b968e79a4987834 (diff)
downloadpoky-47bb92e51c858a96e3221849f8a663f7e8675f23.tar.gz
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: 8068eaccf89779d374791837215895432e45e85d) 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>
Diffstat (limited to 'meta')
-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 379bed44f2..846b19663b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -92,6 +92,8 @@ python __anonymous () {
92 imagedest = d.getVar('KERNEL_IMAGEDEST') 92 imagedest = d.getVar('KERNEL_IMAGEDEST')
93 93
94 for type in types.split(): 94 for type in types.split():
95 if bb.data.inherits_class('nopackages', d):
96 continue
95 typelower = type.lower() 97 typelower = type.lower()
96 d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower)) 98 d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
97 d.setVar('FILES_' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type) 99 d.setVar('FILES_' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)