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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta-selftest/conf/layer.conf b/meta-selftest/conf/layer.conf
index 889c056eb653445a8649f9a945d0f7154565965a..2eeea0444b9f1364e6688c88a5d1512199bba178 100644 (file)
--- a/meta-selftest/conf/layer.conf
+++ b/meta-selftest/conf/layer.conf
@@ -11,4 +11,4 @@ BBFILE_PRIORITY_selftest = "5"
 
 addpylib ${LAYERDIR}/lib oeqa
 
-LAYERSERIES_COMPAT_selftest = "kirkstone langdale"
+LAYERSERIES_COMPAT_selftest = "mickledore"

diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf
index 1704a753a08d3f979affb55e7c5815ead31fc706..564ae265019ef25c5527431cf25e32a8261aca99 100644 (file)
--- a/meta-skeleton/conf/layer.conf
+++ b/meta-skeleton/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERVERSION_skeleton = "1"
 
 LAYERDEPENDS_skeleton = "core"
 
-LAYERSERIES_COMPAT_skeleton = "kirkstone langdale"
+LAYERSERIES_COMPAT_skeleton = "mickledore"

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index e41ada5d35d9160fb5e3b47fa19a682c3eb660c1..948ded667e8614634a8cc9886145f9c5ad959caa 100644 (file)
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -7,12 +7,12 @@ BBFILE_COLLECTIONS += "core"
 BBFILE_PATTERN_core = "^${LAYERDIR}/"
 BBFILE_PRIORITY_core = "5"
 
-LAYERSERIES_CORENAMES = "langdale"
+LAYERSERIES_CORENAMES = "mickledore"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
-LAYERVERSION_core = "14"
-LAYERSERIES_COMPAT_core = "kirkstone langdale"
+LAYERVERSION_core = "15"
+LAYERSERIES_COMPAT_core = "mickledore"
 
 BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"