From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Mon, 18 Mar 2024 19:27:26 +0000 (+0100)
Subject: Fix template for s4 and adapt kernel recipe
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl.git;a=commitdiff_plain;h=45f70de44a6490597423de1fd09a196c1fd4d8f4

Fix template for s4 and adapt kernel recipe

The template needs meta-python present and the
kernel recipe does try to install a firmware file
that is not packaged. Remove that.

Bug-AGL: SPEC-5101
Change-Id: I3fdb860df04ee90e3e3b30875ea4f9494b15dbf0
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29744
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
---

diff --git a/meta-agl-bsp/meta-rcar-gateway/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gateway/recipes-kernel/linux/linux-renesas_%.bbappend
new file mode 100644
index 000000000..d565da8ac
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gateway/recipes-kernel/linux/linux-renesas_%.bbappend
@@ -0,0 +1,11 @@
+do_install:append () {
+
+    # Remove firmware file that is not packaged in the kernel.
+    # It throws an error during do_package.
+    # It seems to be moved out of the kernel in later BSP versions.
+    rm -rf ${D}/lib/firmware/r8a779f0_ufs.bin
+    rm -rf ${D}/lib/firmware
+    rm -rf ${D}/lib
+
+}
+
diff --git a/templates/machine/s4sk/50_bblayers.conf.inc b/templates/machine/s4sk/50_bblayers.conf.inc
index 0095dbcc4..0cc25a9ab 100644
--- a/templates/machine/s4sk/50_bblayers.conf.inc
+++ b/templates/machine/s4sk/50_bblayers.conf.inc
@@ -2,3 +2,6 @@ BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas/meta-rcar-gateway \
   ${METADIR}/external/poky/meta-yocto-bsp \
   "
+
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+