diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-01-24 17:02:06 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 22:23:07 +0000 |
commit | a5507f383cdab99806df131bf4aef191799c5153 (patch) | |
tree | baaba4646a36e6acae1aaf618433a738d1b6d754 /meta-poky | |
parent | 24d0d206336147284c9334596f000cf84058838e (diff) | |
download | poky-a5507f383cdab99806df131bf4aef191799c5153.tar.gz |
poky/poky-tiny: bump preferred version to 6.1
5.19 will be removed shortly, bumping the preferred versions for
poky/poky-tiny to 6.1. The -alt config remains on 5.15.
(From meta-yocto rev: 535ef93ef68af20b06effb0dd899895a192bb412)
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.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 74f2fc7422..f65d2dabf3 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf | |||
@@ -44,7 +44,7 @@ FULL_OPTIMIZATION="-Os -pipe ${DEBUG_FLAGS}" | |||
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 ?= "5.19%" | 47 | PREFERRED_VERSION_linux-yocto-tiny ?= "6.1%" |
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 a7e07b248a..3d228780c5 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf | |||
@@ -20,8 +20,8 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" | |||
20 | 20 | ||
21 | DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" | 21 | DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" |
22 | 22 | ||
23 | PREFERRED_VERSION_linux-yocto ?= "5.19%" | 23 | PREFERRED_VERSION_linux-yocto ?= "6.1%" |
24 | PREFERRED_VERSION_linux-yocto-rt ?= "5.19%" | 24 | PREFERRED_VERSION_linux-yocto-rt ?= "6.1%" |
25 | 25 | ||
26 | SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" | 26 | SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" |
27 | SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" | 27 | SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" |