diff options
9 files changed, 6 insertions, 75 deletions
diff --git a/meta-raspberrypi-extra/recipes-kernel/linux/linux-raspberrypi_6.18.bbappend b/meta-raspberrypi-extra/recipes-kernel/linux/linux-raspberrypi_6.18.bbappend new file mode 100644 index 0000000..73fe883 --- /dev/null +++ b/meta-raspberrypi-extra/recipes-kernel/linux/linux-raspberrypi_6.18.bbappend @@ -0,0 +1,4 @@ +LINUX_VERSION = "6.18.35" + +SRCREV_machine = "71f493dd5f8072d1298475ed8a16fd38e8378f4b" +SRCREV_meta = "4101033495af309ba83fc76eb3c0cbd0fb030f8c" 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 261acb6..43eedcd 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,7 +15,6 @@ 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/layers/meta-raspberrypi/patches/wrynose/patches.yml - meta-unit-kas/include/features/systemd.yml repos: 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 059049c..58cf24b 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,11 +15,11 @@ 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 repos: meta-unit: layers: + meta-raspberrypi-extra: meta-unit-kas: 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 8f773b3..33377f4 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,7 +15,6 @@ 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 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 4571071..893f843 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,7 +12,6 @@ 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 diff --git a/meta-unit-kas/include/layers/meta-raspberrypi/conf.yml b/meta-unit-kas/include/layers/meta-raspberrypi/conf.yml index 43740a9..5b9ac2f 100644 --- a/meta-unit-kas/include/layers/meta-raspberrypi/conf.yml +++ b/meta-unit-kas/include/layers/meta-raspberrypi/conf.yml @@ -9,3 +9,4 @@ local_conf_header: ENABLE_DWC2_HOST = "1" ENABLE_SPI_BUS = "1" ENABLE_WATCHDOG = "1" + PREFERRED_VERSION_linux-raspberrypi = "6.18.%" diff --git a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/patches.yml b/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/patches.yml deleted file mode 100644 index 5afab29..0000000 --- a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/patches.yml +++ /dev/null @@ -1,9 +0,0 @@ -header: - version: 20 - -repos: - meta-raspberrypi: - patches: - quilt: - repo: meta-unit - path: meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/ diff --git a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-linux-raspberrypi-6.18.24.patch b/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-linux-raspberrypi-6.18.24.patch deleted file mode 100644 index 2fbd6fc..0000000 --- a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-linux-raspberrypi-6.18.24.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 02af53ec0e5973ef7fe6803d2572a21ca6144564 Mon Sep 17 00:00:00 2001 -From: unitexe <unitexe70@gmail.com> -Date: Fri, 24 Apr 2026 08:30:46 -0500 -Subject: [PATCH] linux-raspberrypi: 6.18.24 - ---- - 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..dbfef0f ---- /dev/null -+++ b/recipes-kernel/linux/linux-raspberrypi_6.18.bb -@@ -0,0 +1,31 @@ -+LINUX_VERSION ?= "6.18.24" -+LINUX_RPI_BRANCH ?= "rpi-6.18.y" -+LINUX_RPI_KMETA_BRANCH ?= "yocto-6.18" -+ -+SRCREV_machine = "f2f68e79f16fe405f43e957f5aac8ac6f400b112" -+SRCREV_meta = "f94e250f9bd55d855b1a41e3cd72beebb3849ae3" -+ -+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 deleted file mode 100644 index 34dd9b5..0000000 --- a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/series +++ /dev/null @@ -1 +0,0 @@ -0001-linux-raspberrypi-6.18.24.patch
\ No newline at end of file |