summaryrefslogtreecommitdiffstats
path: root/meta-poky/conf
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-01-11 13:06:24 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-12 21:09:02 +0000
commit6a2dfdf27a6829df9f58e825af2f90f0297a3aa0 (patch)
treeabe6dfac21be51f29c9e6823c418ca3b2834a7d4 /meta-poky/conf
parent7031fe7223c8f562ccabd159fab153ce4bac76e2 (diff)
downloadpoky-6a2dfdf27a6829df9f58e825af2f90f0297a3aa0.tar.gz
poky: set default kernel to 5.15
5.14 is no longer actively maintained, so we bump our default to the 5.15 LTS. (From meta-yocto rev: 70b3acd078ee2b09a541fc6c4e295b5c2ab386a6) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky/conf')
-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 756c65a2f9..b6c4eeccd0 100644
--- a/meta-poky/conf/distro/poky-tiny.conf
+++ b/meta-poky/conf/distro/poky-tiny.conf
@@ -43,7 +43,7 @@ FULL_OPTIMIZATION="-Os -pipe ${DEBUG_FLAGS}"
43# Distro config is evaluated after the machine config, so we have to explicitly 43# Distro config is evaluated after the machine config, so we have to explicitly
44# set the kernel provider to override a machine config. 44# set the kernel provider to override a machine config.
45PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" 45PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny"
46PREFERRED_VERSION_linux-yocto-tiny ?= "5.14%" 46PREFERRED_VERSION_linux-yocto-tiny ?= "5.15%"
47 47
48# We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny 48# We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny
49#POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" 49#POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot"
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index b92784fdc4..2dc3606ae5 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 ?= "5.14%" 22PREFERRED_VERSION_linux-yocto ?= "5.15%"
23PREFERRED_VERSION_linux-yocto-rt ?= "5.14%" 23PREFERRED_VERSION_linux-yocto-rt ?= "5.15%"
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}"