* [OE-core][hardknott][PATCH 1/2] kernel: Fix interaction when packaging disabled
@ 2021-06-27 22:33 Andrea Adami
2021-06-27 22:33 ` [OE-core][hardknott][PATCH 2/2] kernel-devicetree: " Andrea Adami
0 siblings, 1 reply; 2+ messages in thread
From: Andrea Adami @ 2021-06-27 22:33 UTC (permalink / raw
To: openembedded-core; +Cc: Anuj Mittal, Richard Purdie
From: Richard Purdie <richard.purdie@linuxfoundation.org>
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.
Backport of commit 2522daf from master.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/kernel.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 8693ab86be..ed417be43a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -92,6 +92,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)
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [OE-core][hardknott][PATCH 2/2] kernel-devicetree: Fix interaction when packaging disabled
2021-06-27 22:33 [OE-core][hardknott][PATCH 1/2] kernel: Fix interaction when packaging disabled Andrea Adami
@ 2021-06-27 22:33 ` Andrea Adami
0 siblings, 0 replies; 2+ messages in thread
From: Andrea Adami @ 2021-06-27 22:33 UTC (permalink / raw
To: openembedded-core; +Cc: Anuj Mittal, Richard Purdie
From: Richard Purdie <richard.purdie@linuxfoundation.org>
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.
Backport of commit d6b114c from master.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/kernel-devicetree.bbclass | 11 +++++++----
1 file 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"
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-27 22:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-27 22:33 [OE-core][hardknott][PATCH 1/2] kernel: Fix interaction when packaging disabled Andrea Adami
2021-06-27 22:33 ` [OE-core][hardknott][PATCH 2/2] kernel-devicetree: " Andrea Adami
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.