From cb3dedaede4c6ed74beec3063735ef5360459d7a Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Wed, 22 May 2024 20:26:44 +0200 Subject: [PATCH] rockchip-extlinux.inc: add kernel and dtb packages to the image 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. Reviewed-by: Trevor Woerner Fixes: 3b51866f2251 ("remove /boot partition") Signed-off-by: Quentin Schulz --- conf/machine/include/rockchip-extlinux.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/include/rockchip-extlinux.inc b/conf/machine/include/rockchip-extlinux.inc index 6286e98..1f036c4 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)}"