linux-raspberrypi 6.18

7 files changed, 67 insertions, 6 deletions

diff --git a/meta-unit-kas/images/poky/raspberrypi0-2w-64/core-image-base/wrynose.yml b/meta-unit-kas/images/poky/raspberrypi0-2w-64/core-image-base/wrynose.yml
index f4cdb2e..fadb4bb 100644
--- a/meta-unit-kas/images/poky/raspberrypi0-2w-64/core-image-base/wrynose.yml
+++ b/meta-unit-kas/images/poky/raspberrypi0-2w-64/core-image-base/wrynose.yml
@@ -15,8 +15,8 @@ header:
     - meta-unit-kas/include/layers/meta-raspberrypi/main.yml
     - meta-unit-kas/include/layers/meta-raspberrypi/raspberrypi0-2w-64.yml
     - meta-unit-kas/include/layers/meta-raspberrypi/conf.yml
-    - meta-unit-kas/include/features/systemd.yml
     - meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/patches.yml
+    - meta-unit-kas/include/features/systemd.yml
 
 repos:
   meta-unit:
diff --git a/meta-unit-kas/images/poky/raspberrypi3-64/core-image-base/wrynose.yml b/meta-unit-kas/images/poky/raspberrypi3-64/core-image-base/wrynose.yml
index bb1e227..90bb8b6 100644
--- a/meta-unit-kas/images/poky/raspberrypi3-64/core-image-base/wrynose.yml
+++ b/meta-unit-kas/images/poky/raspberrypi3-64/core-image-base/wrynose.yml
@@ -15,9 +15,9 @@ header:
     - meta-unit-kas/include/layers/meta-raspberrypi/main.yml
     - meta-unit-kas/include/layers/meta-raspberrypi/raspberrypi3-64.yml
     - meta-unit-kas/include/layers/meta-raspberrypi/conf.yml
+    - meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/patches.yml
     - meta-unit-kas/include/features/ssh.yml
     - meta-unit-kas/include/features/systemd.yml
-    - meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/patches.yml
 
 repos:
   meta-unit:
diff --git a/meta-unit-kas/images/poky/raspberrypi5/core-image-base/wrynose.yml b/meta-unit-kas/images/poky/raspberrypi5/core-image-base/wrynose.yml
index 183520f..42a9c56 100644
--- a/meta-unit-kas/images/poky/raspberrypi5/core-image-base/wrynose.yml
+++ b/meta-unit-kas/images/poky/raspberrypi5/core-image-base/wrynose.yml
@@ -15,9 +15,9 @@ header:
     - meta-unit-kas/include/layers/meta-raspberrypi/main.yml
     - meta-unit-kas/include/layers/meta-raspberrypi/raspberrypi5.yml
     - meta-unit-kas/include/layers/meta-raspberrypi/conf.yml
+    - meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/patches.yml
     - meta-unit-kas/include/features/ssh.yml
     - meta-unit-kas/include/features/systemd.yml
-    - meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/patches.yml
 
 repos:
   meta-unit:
diff --git a/meta-unit-kas/images/unit-poky/raspberrypi3-64/core-image-unit/wrynose.yml b/meta-unit-kas/images/unit-poky/raspberrypi3-64/core-image-unit/wrynose.yml
index 8955b9f..9d7f7d2 100644
--- a/meta-unit-kas/images/unit-poky/raspberrypi3-64/core-image-unit/wrynose.yml
+++ b/meta-unit-kas/images/unit-poky/raspberrypi3-64/core-image-unit/wrynose.yml
@@ -12,6 +12,7 @@ header:
     - meta-unit-kas/include/layers/meta-raspberrypi/main.yml
     - meta-unit-kas/include/layers/meta-raspberrypi/raspberrypi3-64.yml
     - meta-unit-kas/include/layers/meta-raspberrypi/conf.yml
+    - meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/patches.yml
     - meta-unit-kas/include/layers/meta-openembedded/remote.yml
     - meta-unit-kas/include/layers/meta-openembedded/main.yml
     - meta-unit-kas/include/layers/meta-virtualization/remote.yml
@@ -38,6 +39,7 @@ repos:
       meta-unit-core:
       meta-unit-distro:
       meta-unit-graphics:
+      meta-unit-kas:
       meta-unit-profiling:
       meta-unit-users:
       meta-unit-virtualization:
diff --git a/meta-unit-kas/include/layers/meta-raspberrypi/conf.yml b/meta-unit-kas/include/layers/meta-raspberrypi/conf.yml
index c20a8f4..43740a9 100644
--- a/meta-unit-kas/include/layers/meta-raspberrypi/conf.yml
+++ b/meta-unit-kas/include/layers/meta-raspberrypi/conf.yml
@@ -9,4 +9,3 @@ local_conf_header:
     ENABLE_DWC2_HOST = "1"
     ENABLE_SPI_BUS = "1"
     ENABLE_WATCHDOG = "1"
-    PREFERRED_VERSION_linux-raspberrypi ?= "6.12.%"
diff --git a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-linux-raspberrypi-add-recipe-for-6.18.patch b/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-linux-raspberrypi-add-recipe-for-6.18.patch
new file mode 100644
index 0000000..bdd43da
--- /dev/null
+++ b/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-linux-raspberrypi-add-recipe-for-6.18.patch
@@ -0,0 +1,61 @@
+From 2a16b3fa6a5ad4c795c6eaea5af319e569466dc2 Mon Sep 17 00:00:00 2001
+From: unitexe <unitexe70@gmail.com>
+Date: Fri, 10 Apr 2026 23:58:54 -0500
+Subject: [PATCH] linux-raspberrypi: add recipe for 6.18
+
+---
+ conf/machine/include/rpi-default-versions.inc |  2 +-
+ .../linux/linux-raspberrypi_6.18.bb           | 31 +++++++++++++++++++
+ 2 files changed, 32 insertions(+), 1 deletion(-)
+ create mode 100644 recipes-kernel/linux/linux-raspberrypi_6.18.bb
+
+diff --git a/conf/machine/include/rpi-default-versions.inc b/conf/machine/include/rpi-default-versions.inc
+index 8e3e9be..d2562a0 100644
+--- a/conf/machine/include/rpi-default-versions.inc
++++ b/conf/machine/include/rpi-default-versions.inc
+@@ -1,4 +1,4 @@
+ # RaspberryPi BSP default versions
+ 
+-PREFERRED_VERSION_linux-raspberrypi ??= "6.12.%"
++PREFERRED_VERSION_linux-raspberrypi ??= "6.18.%"
+ PREFERRED_VERSION_linux-raspberrypi-v7 ??= "${PREFERRED_VERSION_linux-raspberrypi}"
+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..483e4fb
+--- /dev/null
++++ b/recipes-kernel/linux/linux-raspberrypi_6.18.bb
+@@ -0,0 +1,31 @@
++LINUX_VERSION ?= "6.18.21"
++LINUX_RPI_BRANCH ?= "rpi-6.18.y"
++LINUX_RPI_KMETA_BRANCH ?= "yocto-6.18"
++
++SRCREV_machine = "8fa1bed551103360706eb33260ed6130e67f7816"
++SRCREV_meta = "8af6e86ecd97388ecbae830d484445146a2a2159"
++
++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}"
+-- 
+2.43.0
+
diff --git a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/series b/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/series
index a4b4768..5870b07 100644
--- a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/series
+++ b/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/series
@@ -1,2 +1 @@
-0001-wic-rename-kickstart-files.patch
-0002-rename-machine-features-backfill-considered.patch
\ No newline at end of file
+0001-linux-raspberrypi-add-recipe-for-6.18.patch
\ No newline at end of file