summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-21 21:29:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-22 08:27:21 +0100
commit07c627645da0785acb54a635acfd8593f9118135 (patch)
tree39e255e067ef99e4e9ec648e19ef576b0f2f9dff
parent21559199516a31c7635c5f2d874eaa4a92fff0e5 (diff)
downloadpoky-07c627645da0785acb54a635acfd8593f9118135.tar.gz
poky/meta-yocto-bsp: Post release version/codename updates
(From meta-yocto rev: e6f4a7f76b8a60f365a111e0b38d6d5090a0b003) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-poky/conf/distro/poky.conf5
-rw-r--r--meta-poky/conf/layer.conf2
-rw-r--r--meta-yocto-bsp/conf/layer.conf2
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 @@
1DISTRO = "poky" 1DISTRO = "poky"
2DISTRO_NAME = "Poky (Yocto Project Reference Distro)" 2DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
3#DISTRO_VERSION = "3.4+snapshot-${METADATA_REVISION}" 3DISTRO_VERSION = "4.1+snapshot-${METADATA_REVISION}"
4DISTRO_VERSION = "4.0" 4DISTRO_CODENAME = "langdale"
5DISTRO_CODENAME = "kirkstone"
6SDK_VENDOR = "-pokysdk" 5SDK_VENDOR = "-pokysdk"
7SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" 6SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}"
8SDK_VERSION[vardepvalue] = "${SDK_VERSION}" 7SDK_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"
9BBFILE_PATTERN_yocto = "^${LAYERDIR}/" 9BBFILE_PATTERN_yocto = "^${LAYERDIR}/"
10BBFILE_PRIORITY_yocto = "5" 10BBFILE_PRIORITY_yocto = "5"
11 11
12LAYERSERIES_COMPAT_yocto = "kirkstone" 12LAYERSERIES_COMPAT_yocto = "kirkstone langdale"
13 13
14# This should only be incremented on significant changes that will 14# This should only be incremented on significant changes that will
15# cause compatibility issues with other layers 15# 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"
9BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" 9BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/"
10BBFILE_PRIORITY_yoctobsp = "5" 10BBFILE_PRIORITY_yoctobsp = "5"
11LAYERVERSION_yoctobsp = "4" 11LAYERVERSION_yoctobsp = "4"
12LAYERSERIES_COMPAT_yoctobsp = "kirkstone" 12LAYERSERIES_COMPAT_yoctobsp = "kirkstone langdale"