From 07c627645da0785acb54a635acfd8593f9118135 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Apr 2022 21:29:49 +0100 Subject: poky/meta-yocto-bsp: Post release version/codename updates (From meta-yocto rev: e6f4a7f76b8a60f365a111e0b38d6d5090a0b003) Signed-off-by: Richard Purdie --- meta-poky/conf/distro/poky.conf | 5 ++--- meta-poky/conf/layer.conf | 2 +- meta-yocto-bsp/conf/layer.conf | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index 5790094ea9..a42e1d4ebb 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf @@ -1,8 +1,7 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -#DISTRO_VERSION = "3.4+snapshot-${METADATA_REVISION}" -DISTRO_VERSION = "4.0" -DISTRO_CODENAME = "kirkstone" +DISTRO_VERSION = "4.1+snapshot-${METADATA_REVISION}" +DISTRO_CODENAME = "langdale" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" SDK_VERSION[vardepvalue] = "${SDK_VERSION}" diff --git a/meta-poky/conf/layer.conf b/meta-poky/conf/layer.conf index f43c875c2a..357cc803da 100644 --- a/meta-poky/conf/layer.conf +++ b/meta-poky/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "yocto" BBFILE_PATTERN_yocto = "^${LAYERDIR}/" BBFILE_PRIORITY_yocto = "5" -LAYERSERIES_COMPAT_yocto = "kirkstone" +LAYERSERIES_COMPAT_yocto = "kirkstone langdale" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-yocto-bsp/conf/layer.conf b/meta-yocto-bsp/conf/layer.conf index ef64c4fba9..29f6037cce 100644 --- a/meta-yocto-bsp/conf/layer.conf +++ b/meta-yocto-bsp/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" LAYERVERSION_yoctobsp = "4" -LAYERSERIES_COMPAT_yoctobsp = "kirkstone" +LAYERSERIES_COMPAT_yoctobsp = "kirkstone langdale" -- cgit v1.2.3-54-g00ecf