diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-06 11:06:23 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-08 23:54:04 +0100 |
commit | 976f69ff1bd0d4711cc43276497a3b852051f1b5 (patch) | |
tree | 63b4bbfc6e78e42dc38baea25c3d56bf19634997 /meta | |
parent | 0f6ea144a7a28e3971cf28ae175d6bd4f59d07fe (diff) | |
download | poky-976f69ff1bd0d4711cc43276497a3b852051f1b5.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: 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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel.bbclass | 2 |
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 () { | |||
90 | imagedest = d.getVar('KERNEL_IMAGEDEST') | 90 | imagedest = d.getVar('KERNEL_IMAGEDEST') |
91 | 91 | ||
92 | for type in types.split(): | 92 | for type in types.split(): |
93 | if bb.data.inherits_class('nopackages', d): | ||
94 | continue | ||
93 | typelower = type.lower() | 95 | typelower = type.lower() |
94 | d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower)) | 96 | d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower)) |
95 | d.setVar('FILES_' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type) | 97 | d.setVar('FILES_' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type) |