diff mbox series

[meta-rockchip,2/2] rockchip-extlinux.inc: add kernel and dtb packages to the image

Message ID 20240522-nonfitdt-multi-dt-v1-2-c75dffd3aa7c@cherry.de
State New
Headers show
Series fix 2+ DTB in KERNEL_DEVICETREE and empty /boot without kernel-modules | expand

Commit Message

Quentin Schulz May 22, 2024, 6:26 p.m. UTC 
From: Quentin Schulz <quentin.schulz@cherry.de>

If an image doesn't include kernel-modules, the kernel-image package
won't be installed by default. This means that no
kernel-image-${KERNEL_IMAGETYPE} package will be pulled in, resulting in
neither fitImage nor Image (or uImage, or zImage, or...) making it to
the filesystem, rendering the image non-bootable.

For non-fitImage scenarios, we currently expect DTB-less kernel images
(no bundle, like in uImage) so we also need to pull in the DTB via the
kernel-devicetree package.

Those packages used to be pulled in by the wic plugin through the
IMAGE_BOOT_FILES variable.

Fixes: 3b51866f2251 ("remove /boot partition")
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 conf/machine/include/rockchip-extlinux.inc | 1 +
 1 file changed, 1 insertion(+)

Comments

Trevor Woerner May 26, 2024, 1:37 p.m. UTC | #1 
On Wed 2024-05-22 @ 08:26:44 PM, Quentin Schulz via lists.yoctoproject.org wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
> 
> If an image doesn't include kernel-modules, the kernel-image package
> won't be installed by default. This means that no
> kernel-image-${KERNEL_IMAGETYPE} package will be pulled in, resulting in
> neither fitImage nor Image (or uImage, or zImage, or...) making it to
> the filesystem, rendering the image non-bootable.
> 
> For non-fitImage scenarios, we currently expect DTB-less kernel images
> (no bundle, like in uImage) so we also need to pull in the DTB via the
> kernel-devicetree package.
> 
> Those packages used to be pulled in by the wic plugin through the
> IMAGE_BOOT_FILES variable.
> 
> Fixes: 3b51866f2251 ("remove /boot partition")
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
>  conf/machine/include/rockchip-extlinux.inc | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Trevor Woerner <twoerner@gmail.com>
Applied to meta-rockchip, master branch. Thanks!
diff mbox series

Patch

diff --git a/conf/machine/include/rockchip-extlinux.inc b/conf/machine/include/rockchip-extlinux.inc
index 10bb190..d6de680 100644
--- a/conf/machine/include/rockchip-extlinux.inc
+++ b/conf/machine/include/rockchip-extlinux.inc
@@ -22,3 +22,4 @@  UBOOT_EXTLINUX_LABELS ?= "default"
 UBOOT_EXTLINUX_MENU_DESCRIPTION:default ?= "${MACHINE}"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-extlinux"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', 'kernel-devicetree', d)}"