From 7f43964582153315d6978fa0cfad8779aa28a7b0 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 16 May 2022 10:14:29 +0200 Subject: [PATCH] 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/apalis-imx6.conf | 2 +- conf/machine/colibri-imx6.conf | 2 +- conf/machine/colibri-imx6ull.conf | 2 +- conf/machine/colibri-imx7-emmc.conf | 2 +- conf/machine/colibri-imx7-nand.conf | 2 +- conf/machine/colibri-vf.conf | 2 +- conf/machine/nitrogen8m.conf | 2 +- conf/machine/nitrogen8mm.conf | 2 +- conf/machine/nitrogen8mn.conf | 2 +- conf/machine/nitrogen8mp.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf index 0167a8a..4da3635 100644 --- a/conf/machine/apalis-imx6.conf +++ b/conf/machine/apalis-imx6.conf @@ -19,7 +19,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " imx6q-apalis-ixora-v1.2.dtb" KERNEL_IMAGETYPE = "zImage" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_RPROVIDER_u-boot-default-script = "u-boot-script-toradex" diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf index d6ee6a9..c808f81 100644 --- a/conf/machine/colibri-imx6.conf +++ b/conf/machine/colibri-imx6.conf @@ -17,7 +17,7 @@ KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb KERNEL_DEVICETREE:use-mainline-bsp = "imx6dl-colibri-eval-v3.dtb" KERNEL_IMAGETYPE = "zImage" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-script-toradex" diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx6ull.conf index b15e9d6..b6dc01e 100644 --- a/conf/machine/colibri-imx6ull.conf +++ b/conf/machine/colibri-imx6ull.conf @@ -22,7 +22,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ KERNEL_IMAGETYPE = "zImage" # The kernel lives in its own ubi volume. -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" diff --git a/conf/machine/colibri-imx7-emmc.conf b/conf/machine/colibri-imx7-emmc.conf index 8c29032..5815a95 100644 --- a/conf/machine/colibri-imx7-emmc.conf +++ b/conf/machine/colibri-imx7-emmc.conf @@ -21,7 +21,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ " # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_RPROVIDER_u-boot-default-script = "u-boot-script-toradex" diff --git a/conf/machine/colibri-imx7-nand.conf b/conf/machine/colibri-imx7-nand.conf index a78fd4e..73d0e2f 100644 --- a/conf/machine/colibri-imx7-nand.conf +++ b/conf/machine/colibri-imx7-nand.conf @@ -25,7 +25,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ # U-Boot of our newer release read the Kernel and device tree from static UBI # volumes, hence no need to deploy the kernel binary in the image itself -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf index 30621ae..435c105 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -25,7 +25,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ # U-Boot of our newer release read the Kernel and device tree from static UBI volumes, # hence no need to deploy the kernel binary in the image itself -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" diff --git a/conf/machine/nitrogen8m.conf b/conf/machine/nitrogen8m.conf index 03a3a45..ba5985c 100644 --- a/conf/machine/nitrogen8m.conf +++ b/conf/machine/nitrogen8m.conf @@ -21,7 +21,7 @@ KERNEL_DEVICETREE = "freescale/imx8mq-nitrogen8m.dtb \ freescale/imx8mq-nitrogen8m-edp.dtb \ " KERNEL_IMAGETYPE = "Image" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" # U-Boot configuration PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf index 9ebfbe0..972a543 100644 --- a/conf/machine/nitrogen8mm.conf +++ b/conf/machine/nitrogen8mm.conf @@ -25,7 +25,7 @@ KERNEL_DEVICETREE = "freescale/imx8mq-nitrogen8m.dtb \ freescale/imx8mm-nitrogen8mm_som-tc358743.dtb \ " KERNEL_IMAGETYPE = "Image" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" # U-Boot configuration PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" diff --git a/conf/machine/nitrogen8mn.conf b/conf/machine/nitrogen8mn.conf index c92c18f..f7f71c7 100644 --- a/conf/machine/nitrogen8mn.conf +++ b/conf/machine/nitrogen8mn.conf @@ -20,7 +20,7 @@ KERNEL_DEVICETREE = "freescale/imx8mn-nitrogen8mn.dtb \ KERNEL_IMAGETYPE = "Image" KERNEL_DEFCONFIG = "boundary_defconfig" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" # U-Boot configuration PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" diff --git a/conf/machine/nitrogen8mp.conf b/conf/machine/nitrogen8mp.conf index 30295b2..98a2e76 100644 --- a/conf/machine/nitrogen8mp.conf +++ b/conf/machine/nitrogen8mp.conf @@ -19,7 +19,7 @@ KERNEL_DEVICETREE = "freescale/imx8mp-nitrogen8mp.dtb \ freescale/imx8mp-nitrogen8mp-m4.dtb \ " KERNEL_IMAGETYPE = "Image" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" # U-Boot configuration PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"