diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-12-10 16:06:17 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-12-12 12:32:44 +0000 |
commit | 67fb8af188018a98d68b6ac4e43ad60e028469f6 (patch) | |
tree | 4300994def5480bda57ba4d1dd5e9acfb81c9ee0 | |
parent | 8d8f3a0862d7d997767dc86b6af564883f7f3527 (diff) | |
download | poky-67fb8af188018a98d68b6ac4e43ad60e028469f6.tar.gz |
poky/poky-tiny: update default to v6.12
The 6.12 kernel is a LTS and our next reference kernel, so
we bump our default to it.
(From meta-yocto rev: ba8e2f42a29f3f312879eb2ca2988592ccfa0b4c)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 fd17097b56..20c13e6f60 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf | |||
@@ -44,7 +44,7 @@ FULL_OPTIMIZATION = "-Os" | |||
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. |
46 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" | 46 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" |
47 | PREFERRED_VERSION_linux-yocto-tiny ?= "6.10%" | 47 | PREFERRED_VERSION_linux-yocto-tiny ?= "6.12%" |
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 b17bee5db5..eeaacd7b88 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 ?= "6.10%" | 22 | PREFERRED_VERSION_linux-yocto ?= "6.12%" |
23 | PREFERRED_VERSION_linux-yocto-rt ?= "6.10%" | 23 | PREFERRED_VERSION_linux-yocto-rt ?= "6.12%" |
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}" |