summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2022-05-16 10:14:29 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2022-06-16 16:53:22 -0300
commit6752c742a2076b35c2e2e57538126c5cf0fdefc0 (patch)
tree11eda46f992a0a224796e1cc615c5363ebe52e56
parentd5ced4cbbf70e33c05b807ae23833889882e7fe1 (diff)
downloadmeta-freescale-6752c742a2076b35c2e2e57538126c5cf0fdefc0.tar.gz
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 <max.krummenacher@toradex.com> (cherry picked from commit 5171b4b59adae5f5cea3c0df7a07d5a6a1585c51)
-rw-r--r--conf/machine/imx8qm-mek.conf2
-rw-r--r--conf/machine/include/imx8dxl-evk.inc2
-rw-r--r--conf/machine/include/imx8x-mek.inc2
-rw-r--r--recipes-kernel/linux/linux-qoriq.inc2
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"
14MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" 14MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
15 15
16# Don't include kernels in standard images 16# Don't include kernels in standard images
17RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" 17RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
18 18
19LOADADDR = "" 19LOADADDR = ""
20 20
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"
9MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" 9MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
10 10
11# Don't include kernels in standard images 11# Don't include kernels in standard images
12RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" 12RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
13 13
14LOADADDR = "" 14LOADADDR = ""
15 15
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"
7MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" 7MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
8 8
9# Don't include kernels in standard images 9# Don't include kernels in standard images
10RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" 10RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
11 11
12LOADADDR = "" 12LOADADDR = ""
13 13
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"
9 9
10DEPENDS:append = " libgcc" 10DEPENDS:append = " libgcc"
11# not put Images into /boot of rootfs, install kernel-image if needed 11# not put Images into /boot of rootfs, install kernel-image if needed
12RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" 12RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
13 13
14KERNEL_CC:append = " ${TOOLCHAIN_OPTIONS}" 14KERNEL_CC:append = " ${TOOLCHAIN_OPTIONS}"
15KERNEL_LD:append = " ${TOOLCHAIN_OPTIONS}" 15KERNEL_LD:append = " ${TOOLCHAIN_OPTIONS}"