summaryrefslogtreecommitdiffstats
path: root/meta-poky
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-12-17 15:38:31 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-05 13:48:41 +0000
commitdd4297f586cb8914988dd5eb73d05e0cab1c0c98 (patch)
tree28b4012c0b43cea16a014603e16685b41c1d9072 /meta-poky
parent3062672689f86a5bd882d63a94554afc5588f51e (diff)
downloadpoky-dd4297f586cb8914988dd5eb73d05e0cab1c0c98.tar.gz
poky/poky-tiny: set preferred kernel to 5.10
(From meta-yocto rev: c368e39620afd92e0066bc4f5ea1eba6b8f00fd6) 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 e125b23d46..5a867b1de5 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.8%" 46PREFERRED_VERSION_linux-yocto-tiny ?= "5.10%"
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 b33df3c17f..623f39da66 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.8%" 22PREFERRED_VERSION_linux-yocto ?= "5.10%"
23PREFERRED_VERSION_linux-yocto-rt ?= "5.4%" 23PREFERRED_VERSION_linux-yocto-rt ?= "5.10%"
24 24
25SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" 25SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
26SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" 26SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"