From ba2fa52ad7b4000f2bc510a76b3eb313ffc6b5ac Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo.barbolini@m4ss.net>
Date: Mon, 18 May 2026 11:37:26 +0200
Subject: [PATCH] linux-raspberrypi: add recipe for 6.18

Adds a recipe for the rpi-6.18.y branch of the raspberrypi/linux
tree alongside the existing 6.1, 6.6 and 6.12 recipes.

Note that 6.18 is not yet considered stable on Raspberry Pi OS:
upstream has not cut a stable_* tag against this series and users
are still reporting regressions on the Raspberry Pi forums. The
default kernel is therefore intentionally left at 6.12 in
conf/machine/include/rpi-default-versions.inc; opt in by setting
PREFERRED_VERSION_linux-raspberrypi to "6.18.%".

https://github.com/raspberrypi/linux/tree/rpi-6.18.y

Signed-off-by: Paolo Barbolini <paolo.barbolini@m4ss.net>
---
 .../linux/linux-raspberrypi-v7_6.18.bb        |  6 ++++
 .../linux/linux-raspberrypi_6.18.bb           | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-v7_6.18.bb
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_6.18.bb

diff --git a/recipes-kernel/linux/linux-raspberrypi-v7_6.18.bb b/recipes-kernel/linux/linux-raspberrypi-v7_6.18.bb
new file mode 100644
index 0000000..8c723fb
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-v7_6.18.bb
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
+#
+# SPDX-License-Identifier: MIT
+
+require linux-raspberrypi-v7.inc
+require linux-raspberrypi_6.18.bb
diff --git a/recipes-kernel/linux/linux-raspberrypi_6.18.bb b/recipes-kernel/linux/linux-raspberrypi_6.18.bb
new file mode 100644
index 0000000..55beb8f
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_6.18.bb
@@ -0,0 +1,31 @@
+LINUX_VERSION ?= "6.18.33"
+LINUX_RPI_BRANCH ?= "rpi-6.18.y"
+LINUX_RPI_KMETA_BRANCH ?= "yocto-6.18"
+
+SRCREV_machine = "95b85bebbedcaedfa7ca79116ed38b7376fba412"
+SRCREV_meta = "6d012fbc35201ba081efcc19c9519c1dc7b64c43"
+
+KMETA = "kernel-meta"
+
+SRC_URI = " \
+    git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \
+    git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \
+    file://powersave.cfg \
+    file://android-drivers.cfg \
+    "
+
+require linux-raspberrypi.inc
+
+KERNEL_DTC_FLAGS += "-@ -H epapr"
+
+RDEPENDS:${KERNEL_PACKAGE_NAME}:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-base"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-image:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-image"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-dev:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dev"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-vmlinux:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-vmlinux"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-modules:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-modules"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-dbg:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dbg"
+
+DEPLOYDEP = ""
+DEPLOYDEP:raspberrypi-armv7 = "${RASPBERRYPI_v7_KERNEL}:do_deploy"
+do_deploy[depends] += "${DEPLOYDEP}"