summaryrefslogtreecommitdiffstats
path: root/meta-poky
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-07-09 23:20:25 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-08-16 07:49:17 +0100
commit5fb7398b77b9f7df08f15d93b6e8845f5ed35cc9 (patch)
tree0bbd6c3540cdcd44727c29ca218933fa760c22ce /meta-poky
parentad9b04b0518078eb0e76860665e4b02edc2c0dd2 (diff)
downloadpoky-5fb7398b77b9f7df08f15d93b6e8845f5ed35cc9.tar.gz
poky/poky-tiny: set preferred linux-yocto version to 6.4
Bumping poky and poky tiny to test the latest refernce kernel. We leave poky-alt on 6.1 for LTS coverage. (From meta-yocto rev: bb261e23b458b7631006ccd6ce38b91fa096b451) (From meta-yocto rev: 11efa4cf80928cb1036c350a26e221d2de4817cc) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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 728d161d59..7b04b35d4a 100644
--- a/meta-poky/conf/distro/poky-tiny.conf
+++ b/meta-poky/conf/distro/poky-tiny.conf
@@ -44,7 +44,7 @@ FULL_OPTIMIZATION="-Os -pipe ${DEBUG_FLAGS}"
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.1%" 47PREFERRED_VERSION_linux-yocto-tiny ?= "6.4%"
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 8dfd581efc..388694b2f8 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.1%" 22PREFERRED_VERSION_linux-yocto ?= "6.4%"
23PREFERRED_VERSION_linux-yocto-rt ?= "6.1%" 23PREFERRED_VERSION_linux-yocto-rt ?= "6.4%"
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}"