From 414c5f1103ba890df0b9604a69054b4092abe4d5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 22 Sep 2021 13:53:53 -0400 Subject: poky: set default kernel to 5.14 both -rt and -standard have been updated to 5.14, so we switch out defaults. (From meta-yocto rev: 952a771f5707d9e84beee6195b7a3cfb3a930702) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta-poky/conf/distro/poky-tiny.conf | 2 +- meta-poky/conf/distro/poky.conf | 4 ++-- 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 b8f5f21a31..756c65a2f9 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}" # Distro config is evaluated after the machine config, so we have to explicitly # set the kernel provider to override a machine config. PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" -PREFERRED_VERSION_linux-yocto-tiny ?= "5.13%" +PREFERRED_VERSION_linux-yocto-tiny ?= "5.14%" # We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny #POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index ae0c52178a..e161e4943a 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" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "5.13%" -PREFERRED_VERSION_linux-yocto-rt ?= "5.13%" +PREFERRED_VERSION_linux-yocto ?= "5.14%" +PREFERRED_VERSION_linux-yocto-rt ?= "5.14%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" -- cgit v1.2.3-54-g00ecf