summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-03 12:31:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-03 15:47:29 +0000
commitdb47e8aa9e60adfec3f4201e66039bc513ab7cb2 (patch)
tree118f48d4d24869be52f69bd12253336de252f3e4
parent64625155eca8399f403b992ec536897f75956baa (diff)
downloadpoky-db47e8aa9e60adfec3f4201e66039bc513ab7cb2.tar.gz
layer.conf: Update to use mickledore as the layer series name
OE-Core has changes which do need careful evaluation for compatibilty, such as the addpylib directive. Move the core later names to mickledore so layers can mark their compatibility as such. Also increase the version number for core. If we do make further changes that need layer changes, we'll update the version again so layers can mark compatibility within the series. (From OE-Core rev: 57239d66b933c4313cf331d35d13ec2d0661c38f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-selftest/conf/layer.conf2
-rw-r--r--meta-skeleton/conf/layer.conf2
-rw-r--r--meta/conf/layer.conf6
3 files changed, 5 insertions, 5 deletions
diff --git a/meta-selftest/conf/layer.conf b/meta-selftest/conf/layer.conf
index 889c056eb6..2eeea0444b 100644
--- a/meta-selftest/conf/layer.conf
+++ b/meta-selftest/conf/layer.conf
@@ -11,4 +11,4 @@ BBFILE_PRIORITY_selftest = "5"
11 11
12addpylib ${LAYERDIR}/lib oeqa 12addpylib ${LAYERDIR}/lib oeqa
13 13
14LAYERSERIES_COMPAT_selftest = "kirkstone langdale" 14LAYERSERIES_COMPAT_selftest = "mickledore"
diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf
index 1704a753a0..564ae26501 100644
--- a/meta-skeleton/conf/layer.conf
+++ b/meta-skeleton/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERVERSION_skeleton = "1"
14 14
15LAYERDEPENDS_skeleton = "core" 15LAYERDEPENDS_skeleton = "core"
16 16
17LAYERSERIES_COMPAT_skeleton = "kirkstone langdale" 17LAYERSERIES_COMPAT_skeleton = "mickledore"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index e41ada5d35..948ded667e 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -7,12 +7,12 @@ BBFILE_COLLECTIONS += "core"
7BBFILE_PATTERN_core = "^${LAYERDIR}/" 7BBFILE_PATTERN_core = "^${LAYERDIR}/"
8BBFILE_PRIORITY_core = "5" 8BBFILE_PRIORITY_core = "5"
9 9
10LAYERSERIES_CORENAMES = "langdale" 10LAYERSERIES_CORENAMES = "mickledore"
11 11
12# This should only be incremented on significant changes that will 12# This should only be incremented on significant changes that will
13# cause compatibility issues with other layers 13# cause compatibility issues with other layers
14LAYERVERSION_core = "14" 14LAYERVERSION_core = "15"
15LAYERSERIES_COMPAT_core = "kirkstone langdale" 15LAYERSERIES_COMPAT_core = "mickledore"
16 16
17BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" 17BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
18 18