summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-01 08:17:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-10 09:53:48 +0100
commit1d33140e3615586cdc49d400d9eb1c80a965dd40 (patch)
treecd7fa1d2c186692519a49ab301e4334385278913
parentc0af426af86d634b2bcef4d76e5c46b46dde7acf (diff)
downloadpoky-1d33140e3615586cdc49d400d9eb1c80a965dd40.tar.gz
poky/poky-tiny: Switch to the 6.5 kernel
6.4 is EOL so switch to the 6.5 kernel. (From meta-yocto rev: 2b6624b894c8a458be7d4b13b1691a89ead44120) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 7b04b35d4a..32c2ec3e1f 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.4%" 47PREFERRED_VERSION_linux-yocto-tiny ?= "6.5%"
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 3bc7bff011..f290a15e35 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.4%" 22PREFERRED_VERSION_linux-yocto ?= "6.5%"
23PREFERRED_VERSION_linux-yocto-rt ?= "6.4%" 23PREFERRED_VERSION_linux-yocto-rt ?= "6.5%"
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}"