summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-poky/conf/distro/include/poky-distro-alt-test-config.inc2
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend19
2 files changed, 1 insertions, 20 deletions
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 @@
2DISTRO_FEATURES:append = " pam" 2DISTRO_FEATURES:append = " pam"
3 3
4# Use the LTSI Kernel 4# Use the LTSI Kernel
5PREFERRED_VERSION_linux-yocto = "5.15%" 5PREFERRED_VERSION_linux-yocto = "6.1%"
6 6
7# Ensure the kernel nfs server is enabled 7# Ensure the kernel nfs server is enabled
8KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" 8KERNEL_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 @@
1KBRANCH:genericx86 = "v5.15/standard/base"
2KBRANCH:genericx86-64 = "v5.15/standard/base"
3KBRANCH:beaglebone-yocto = "v5.15/standard/beaglebone"
4
5KMACHINE:genericx86 ?= "common-pc"
6KMACHINE:genericx86-64 ?= "common-pc-64"
7KMACHINE:beaglebone-yocto ?= "beaglebone"
8
9SRCREV_machine:genericx86 ?= "024d08fb706170a9723e9751e505681f9d4c7ab6"
10SRCREV_machine:genericx86-64 ?= "024d08fb706170a9723e9751e505681f9d4c7ab6"
11SRCREV_machine:beaglebone-yocto ?= "26aee42556a000123129552b73de6bf2ac039034"
12
13COMPATIBLE_MACHINE:genericx86 = "genericx86"
14COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
15COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
16
17LINUX_VERSION:genericx86 = "5.15.103"
18LINUX_VERSION:genericx86-64 = "5.15.103"
19LINUX_VERSION:beaglebone-yocto = "5.15.103"