summaryrefslogtreecommitdiffstats
path: root/meta-poky
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-08-11 14:04:23 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-13 15:48:08 +0100
commit6dea2e6332835bd7b646a520e28ce840f0d98f24 (patch)
tree9741bc40b382576c03ac3a88a97a964399fe1ca1 /meta-poky
parent997b11a5a12fec2bf43c431052f431edc51c8fe6 (diff)
downloadpoky-6dea2e6332835bd7b646a520e28ce840f0d98f24.tar.gz
poky/poky-tiny: bump preferred version to 6.10
Make 6.10 the preferred kernel for these two distro configurations. We leave -altcfg on 6.6 for LTS kernel coverage and testing. (From meta-yocto rev: 05c15cea09dc398ab0f027e738cdb3efa932c137) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky')
-rw-r--r--meta-poky/conf/distro/poky-tiny.conf2
-rw-r--r--meta-poky/conf/distro/poky.conf4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf
index c85a8b5b31..29588e4913 100644
--- a/meta-poky/conf/distro/poky-tiny.conf
+++ b/meta-poky/conf/distro/poky-tiny.conf
@@ -44,7 +44,7 @@ FULL_OPTIMIZATION = "-Os"
44# Distro config is evaluated after the machine config, so we have to explicitly 44# Distro config is evaluated after the machine config, so we have to explicitly
45# set the kernel provider to override a machine config. 45# set the kernel provider to override a machine config.
46PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" 46PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny"
47PREFERRED_VERSION_linux-yocto-tiny ?= "6.6%" 47PREFERRED_VERSION_linux-yocto-tiny ?= "6.10%"
48 48
49# We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny 49# We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny
50#POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" 50#POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot"
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index bf5aa6035c..8270313109 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -19,8 +19,8 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
19 19
20DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" 20DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
21 21
22PREFERRED_VERSION_linux-yocto ?= "6.6%" 22PREFERRED_VERSION_linux-yocto ?= "6.10%"
23PREFERRED_VERSION_linux-yocto-rt ?= "6.6%" 23PREFERRED_VERSION_linux-yocto-rt ?= "6.10%"
24 24
25SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" 25SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
26SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" 26SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}"