From 90b3c244da43efda7d778c0ef5f66b862a7f15da Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 8 Jul 2022 13:23:58 +0200
Subject: [PATCH] meta-digi: do not install kernel image in rootfs

It's just a waste of space as we already have the kernel image in the
'linux' partition and that gets mounted under /mnt/linux.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.10.bb | 5 -----
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 5 -----
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb  | 5 -----
 meta-digi-dey/classes/dey-image.bbclass              | 3 +++
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.10.bb
index 089a4e42d..7db94e09c 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.10.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.10.bb
@@ -24,11 +24,6 @@ require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/li
 # Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared
 SRC_URI +="${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}"
 
-FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/config-${KERNEL_VERSION}"
-
-# Don't include kernels in standard images
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
-
 do_install:append:stm32mpcommon() {
     if ${@bb.utils.contains('MACHINE_FEATURES','gpu','true','false',d)}; then
         # append evbug tool to blacklist
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
index fec9921b8..cce04aa45 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
@@ -24,11 +24,6 @@ require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/li
 # Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared
 SRC_URI +="${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}"
 
-FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/config-${KERNEL_VERSION}"
-
-# Don't include kernels in standard images
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
-
 # Apply configuration fragments
 do_configure:append() {
 	# Only accept fragments ending in .cfg. If the fragments contain
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb
index 31e9ac120..2bc0e2ec5 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb
@@ -17,11 +17,6 @@ require recipes-kernel/linux/linux-trustfence.inc
 # Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared
 SRC_URI += "${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}"
 
-FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/config-${KERNEL_VERSION}"
-
-# Don't include kernels in standard images
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
-
 # Apply configuration fragments
 do_configure:append() {
 	# Only accept fragments ending in .cfg. If the fragments contain
diff --git a/meta-digi-dey/classes/dey-image.bbclass b/meta-digi-dey/classes/dey-image.bbclass
index b703eb3b5..a985f55c3 100644
--- a/meta-digi-dey/classes/dey-image.bbclass
+++ b/meta-digi-dey/classes/dey-image.bbclass
@@ -63,3 +63,6 @@ DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-too
 
 # Remove kernel-module-imx-gpu-viv from all images
 BAD_RECOMMENDATIONS += "kernel-module-imx-gpu-viv"
+
+# Do not include kernel in rootfs images
+PACKAGE_EXCLUDE = "kernel-image-*"