diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-21 21:29:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-22 08:27:21 +0100 |
commit | 07c627645da0785acb54a635acfd8593f9118135 (patch) | |
tree | 39e255e067ef99e4e9ec648e19ef576b0f2f9dff | |
parent | 21559199516a31c7635c5f2d874eaa4a92fff0e5 (diff) | |
download | poky-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.conf | 5 | ||||
-rw-r--r-- | meta-poky/conf/layer.conf | 2 | ||||
-rw-r--r-- | 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 @@ | |||
1 | DISTRO = "poky" | 1 | DISTRO = "poky" |
2 | DISTRO_NAME = "Poky (Yocto Project Reference Distro)" | 2 | DISTRO_NAME = "Poky (Yocto Project Reference Distro)" |
3 | #DISTRO_VERSION = "3.4+snapshot-${METADATA_REVISION}" | 3 | DISTRO_VERSION = "4.1+snapshot-${METADATA_REVISION}" |
4 | DISTRO_VERSION = "4.0" | 4 | DISTRO_CODENAME = "langdale" |
5 | DISTRO_CODENAME = "kirkstone" | ||
6 | SDK_VENDOR = "-pokysdk" | 5 | SDK_VENDOR = "-pokysdk" |
7 | SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" | 6 | SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" |
8 | SDK_VERSION[vardepvalue] = "${SDK_VERSION}" | 7 | 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" | |||
9 | BBFILE_PATTERN_yocto = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_yocto = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_yocto = "5" | 10 | BBFILE_PRIORITY_yocto = "5" |
11 | 11 | ||
12 | LAYERSERIES_COMPAT_yocto = "kirkstone" | 12 | LAYERSERIES_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" | |||
9 | BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_yoctobsp = "5" | 10 | BBFILE_PRIORITY_yoctobsp = "5" |
11 | LAYERVERSION_yoctobsp = "4" | 11 | LAYERVERSION_yoctobsp = "4" |
12 | LAYERSERIES_COMPAT_yoctobsp = "kirkstone" | 12 | LAYERSERIES_COMPAT_yoctobsp = "kirkstone langdale" |