From 76494f2b66003b0ff3b26882435107ef0ac060ba Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 25 May 2023 13:27:51 +0100 Subject: linux-yocto: Drop 5.15 support 5.15 doesn't work with gcc 13 and we'll be replacing 5.15 with a new kernel version later in the release cycle. Drop 5.15 now so we can move forward with gcc 13 and we'll add a new kernel version later. (From meta-yocto rev: 084d840d7f655466d5d668ca309a8b09b83f23fb) Signed-off-by: Richard Purdie --- .../distro/include/poky-distro-alt-test-config.inc | 2 +- .../recipes-kernel/linux/linux-yocto_5.15.bbappend | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend diff --git a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index b42b830e43..32797525fb 100644 --- a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc +++ b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc @@ -2,7 +2,7 @@ DISTRO_FEATURES:append = " pam" # Use the LTSI Kernel -PREFERRED_VERSION_linux-yocto = "5.15%" +PREFERRED_VERSION_linux-yocto = "6.1%" # Ensure the kernel nfs server is enabled KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend deleted file mode 100644 index 7a33505b55..0000000000 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend +++ /dev/null @@ -1,19 +0,0 @@ -KBRANCH:genericx86 = "v5.15/standard/base" -KBRANCH:genericx86-64 = "v5.15/standard/base" -KBRANCH:beaglebone-yocto = "v5.15/standard/beaglebone" - -KMACHINE:genericx86 ?= "common-pc" -KMACHINE:genericx86-64 ?= "common-pc-64" -KMACHINE:beaglebone-yocto ?= "beaglebone" - -SRCREV_machine:genericx86 ?= "024d08fb706170a9723e9751e505681f9d4c7ab6" -SRCREV_machine:genericx86-64 ?= "024d08fb706170a9723e9751e505681f9d4c7ab6" -SRCREV_machine:beaglebone-yocto ?= "26aee42556a000123129552b73de6bf2ac039034" - -COMPATIBLE_MACHINE:genericx86 = "genericx86" -COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" - -LINUX_VERSION:genericx86 = "5.15.103" -LINUX_VERSION:genericx86-64 = "5.15.103" -LINUX_VERSION:beaglebone-yocto = "5.15.103" -- cgit v1.2.3-54-g00ecf