From 5171b4b59adae5f5cea3c0df7a07d5a6a1585c51 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 16 May 2022 10:14:29 +0200 Subject: machines: follow kernel deployment changes The kernel binary image is by default deployed into the rootfs, /boot/. openembedded-core changed the way it is done in a not backwards compatible way. I.e. it now RRECOMMENDS instead of RDEPENDS the package which contains the kernel binary image. Commit 1c90b27d2c ("kernel: make kernel-base recommend kernel-image, not depend") So the way to not deploy also changed. Change machines and recipes which want to prevent kernel deployment accordingly. Signed-off-by: Max Krummenacher --- conf/machine/imx8qm-mek.conf | 2 +- conf/machine/include/imx8dxl-evk.inc | 2 +- conf/machine/include/imx8x-mek.inc | 2 +- recipes-kernel/linux/linux-qoriq.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf index 72c8b6a0..eff8da49 100644 --- a/conf/machine/imx8qm-mek.conf +++ b/conf/machine/imx8qm-mek.conf @@ -14,7 +14,7 @@ MACHINE_FEATURES += "pci optee bcm43455 bcm4356" MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc index 491ebffe..f940fef7 100644 --- a/conf/machine/include/imx8dxl-evk.inc +++ b/conf/machine/include/imx8dxl-evk.inc @@ -9,7 +9,7 @@ MACHINE_FEATURES += "pci bcm43455 bcm4356" MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc index 8a421139..55bce728 100644 --- a/conf/machine/include/imx8x-mek.inc +++ b/conf/machine/include/imx8x-mek.inc @@ -7,7 +7,7 @@ MACHINE_FEATURES += "pci optee bcm43455 bcm4356" MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index bb16942a..5d28ae84 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc @@ -9,7 +9,7 @@ S = "${WORKDIR}/git" DEPENDS:append = " libgcc" # not put Images into /boot of rootfs, install kernel-image if needed -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" KERNEL_CC:append = " ${TOOLCHAIN_OPTIONS}" KERNEL_LD:append = " ${TOOLCHAIN_OPTIONS}" -- cgit v1.2.3-54-g00ecf