diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-26 20:21:41 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-07-05 05:35:36 -1000 |
| commit | 6683b784d3258672c8d56c945db02ba37379cbf6 (patch) | |
| tree | fd4c6c4a3fcf39cb022bd4b1a525a74d6d3fcaee | |
| parent | bcbeef7c6fc55e60d4bb5351e25046705b3b68ea (diff) | |
| download | openembedded-core-contrib-6683b784d3258672c8d56c945db02ba37379cbf6.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2522daf22e2c27dd9c7926feda0345978217c6c3)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -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 85c6594c27..2a3cb21fc0 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -91,6 +91,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) |