diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-09-22 13:53:53 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-24 10:15:29 +0100 |
commit | 414c5f1103ba890df0b9604a69054b4092abe4d5 (patch) | |
tree | bd3730ad9c8386342910964e32fd39ea692c7da7 /meta-poky/conf | |
parent | c744decea1ab83c7ba36091c593967bd041e363c (diff) | |
download | poky-414c5f1103ba890df0b9604a69054b4092abe4d5.tar.gz |
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 <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.conf | 2 | ||||
-rw-r--r-- | 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}" | |||
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. |
45 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" | 45 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" |
46 | PREFERRED_VERSION_linux-yocto-tiny ?= "5.13%" | 46 | PREFERRED_VERSION_linux-yocto-tiny ?= "5.14%" |
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 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" | |||
19 | 19 | ||
20 | DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" | 20 | DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" |
21 | 21 | ||
22 | PREFERRED_VERSION_linux-yocto ?= "5.13%" | 22 | PREFERRED_VERSION_linux-yocto ?= "5.14%" |
23 | PREFERRED_VERSION_linux-yocto-rt ?= "5.13%" | 23 | PREFERRED_VERSION_linux-yocto-rt ?= "5.14%" |
24 | 24 | ||
25 | SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" | 25 | SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" |
26 | SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" | 26 | SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" |