diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-26 20:22:15 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-07-05 05:35:36 -1000 |
| commit | 44756b6d92d922873fe1781e2cc1be3031cc5a86 (patch) | |
| tree | 06a7b8054bd6c41dbd284e8592ac3c8490a9e351 /meta/classes/kernel-devicetree.bbclass | |
| parent | 6683b784d3258672c8d56c945db02ba37379cbf6 (diff) | |
| download | openembedded-core-44756b6d92d922873fe1781e2cc1be3031cc5a86.tar.gz | |
kernel-devicetree: 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 d6b114cf5a9b22688c0b59a3afc46a07450d87b5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/classes/kernel-devicetree.bbclass')
| -rw-r--r-- | meta/classes/kernel-devicetree.bbclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass index d4f8864200..27a4905ac6 100644 --- a/meta/classes/kernel-devicetree.bbclass +++ b/meta/classes/kernel-devicetree.bbclass @@ -1,8 +1,11 @@ # Support for device tree generation -PACKAGES_append = " \ - ${KERNEL_PACKAGE_NAME}-devicetree \ - ${@[d.getVar('KERNEL_PACKAGE_NAME') + '-image-zimage-bundle', ''][d.getVar('KERNEL_DEVICETREE_BUNDLE') != '1']} \ -" +python () { + if not bb.data.inherits_class('nopackages', d): + d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-devicetree") + if d.getVar('KERNEL_DEVICETREE_BUNDLE') == '1': + d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-image-zimage-bundle") +} + FILES_${KERNEL_PACKAGE_NAME}-devicetree = "/${KERNEL_IMAGEDEST}/*.dtb /${KERNEL_IMAGEDEST}/*.dtbo" FILES_${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin" |