treewide: support yocto kirkstone release
* Deprecate N-1 release (hardknott).
* Enable N+1 release (kirkstone).
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I39e027e02dab64b4390b46ffbd9c299c858f403e
diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf
index db636c1..1361965 100644
--- a/meta-amd/conf/layer.conf
+++ b/meta-amd/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "amd-layer"
BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_amd-layer = "hardknott honister"
+LAYERSERIES_COMPAT_amd-layer = "honister kirkstone"
diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf
index 37f32bc..2cd49ff 100644
--- a/meta-amd/meta-ethanolx/conf/layer.conf
+++ b/meta-amd/meta-ethanolx/conf/layer.conf
@@ -9,4 +9,4 @@
BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_ethanolx-layer = "6"
-LAYERSERIES_COMPAT_ethanolx-layer = "hardknott honister"
+LAYERSERIES_COMPAT_ethanolx-layer = "honister kirkstone"
diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf
index 321e2b2..dd0027f 100644
--- a/meta-ampere/conf/layer.conf
+++ b/meta-ampere/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "ampere-layer"
BBFILE_PATTERN_ampere-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ampere-layer = "hardknott honister"
+LAYERSERIES_COMPAT_ampere-layer = "honister kirkstone"
diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf
index f979db1..55d3397 100644
--- a/meta-ampere/meta-jade/conf/layer.conf
+++ b/meta-ampere/meta-jade/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "jade-layer"
BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_jade-layer = "hardknott honister"
+LAYERSERIES_COMPAT_jade-layer = "honister kirkstone"
diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
index 9dd3b72..d6be18b 100644
--- a/meta-aspeed/conf/layer.conf
+++ b/meta-aspeed/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "aspeed-layer"
BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/"
LAYERVERSION_aspeed-layer = "1"
-LAYERSERIES_COMPAT_aspeed-layer = "hardknott honister"
+LAYERSERIES_COMPAT_aspeed-layer = "honister kirkstone"
diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf
index 3798223..61fc90f 100644
--- a/meta-asrock/conf/layer.conf
+++ b/meta-asrock/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "asrock-layer"
BBFILE_PATTERN_asrock-layer = "^${LAYERDIR}/"
LAYERVERSION_asrock-layer = "1"
-LAYERSERIES_COMPAT_asrock-layer = "hardknott honister"
+LAYERSERIES_COMPAT_asrock-layer = "honister kirkstone"
diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf
index 8185611..18b064c 100644
--- a/meta-asrock/meta-e3c246d4i/conf/layer.conf
+++ b/meta-asrock/meta-e3c246d4i/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "e3c246d4i-layer"
BBFILE_PATTERN_e3c246d4i-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_e3c246d4i-layer = "hardknott honister"
+LAYERSERIES_COMPAT_e3c246d4i-layer = "honister kirkstone"
diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf
index 9ece82f..044cb64 100644
--- a/meta-bytedance/conf/layer.conf
+++ b/meta-bytedance/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "bytedance-layer"
BBFILE_PATTERN_bytedance-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_bytedance-layer = "hardknott honister"
+LAYERSERIES_COMPAT_bytedance-layer = "honister kirkstone"
diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf
index e5a5f96..67facaa 100644
--- a/meta-bytedance/meta-g220a/conf/layer.conf
+++ b/meta-bytedance/meta-g220a/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "g220a-layer"
BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_g220a-layer = "hardknott honister"
+LAYERSERIES_COMPAT_g220a-layer = "honister kirkstone"
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
index 277e712..359b479 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "meta-evb-ast2600"
BBFILE_PATTERN_meta-evb-ast2600 = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_meta-evb-ast2600 = "hardknott honister"
+LAYERSERIES_COMPAT_meta-evb-ast2600 = "honister kirkstone"
diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf
index 5c4dfed..e9f894e 100644
--- a/meta-evb/meta-evb-nuvoton/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/conf/layer.conf
@@ -3,4 +3,4 @@
BBFILE_COLLECTIONS += "evb-nuvoton"
BBFILE_PATTERN_evb-nuvoton = ""
-LAYERSERIES_COMPAT_evb-nuvoton = "hardknott honister"
+LAYERSERIES_COMPAT_evb-nuvoton = "honister kirkstone"
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
index 543f6a6..3ac4141 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
@@ -3,4 +3,4 @@
BBFILE_COLLECTIONS += "evb-npcm750"
BBFILE_PATTERN_evb-npcm750 = ""
-LAYERSERIES_COMPAT_evb-npcm750 = "hardknott honister"
+LAYERSERIES_COMPAT_evb-npcm750 = "honister kirkstone"
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index 9e4cf55..e24a899 100644
--- a/meta-facebook/conf/layer.conf
+++ b/meta-facebook/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "facebook-layer"
BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_facebook-layer := "hardknott honister"
+LAYERSERIES_COMPAT_facebook-layer := "honister kirkstone"
diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf
index 14d3200..118ee30 100644
--- a/meta-facebook/meta-bletchley/conf/layer.conf
+++ b/meta-facebook/meta-bletchley/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "bletchley-layer"
BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_bletchley-layer := "hardknott honister"
+LAYERSERIES_COMPAT_bletchley-layer := "honister kirkstone"
diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf
index af34387..b8b221a 100644
--- a/meta-facebook/meta-tiogapass/conf/layer.conf
+++ b/meta-facebook/meta-tiogapass/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "tiogapass-layer"
BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_tiogapass-layer := "hardknott honister"
+LAYERSERIES_COMPAT_tiogapass-layer := "honister kirkstone"
diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf
index 654ffab..ff1dd57 100644
--- a/meta-facebook/meta-yosemitev2/conf/layer.conf
+++ b/meta-facebook/meta-yosemitev2/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "yosemitev2-layer"
BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_yosemitev2-layer := "hardknott honister"
+LAYERSERIES_COMPAT_yosemitev2-layer := "honister kirkstone"
diff --git a/meta-fii/conf/layer.conf b/meta-fii/conf/layer.conf
index ea180d4..9e5d696 100644
--- a/meta-fii/conf/layer.conf
+++ b/meta-fii/conf/layer.conf
@@ -5,4 +5,4 @@
${LAYERDIR}/recipes-*/*/*.bbappend"
BBFILE_COLLECTIONS += "fii-layer"
BBFILE_PATTERN_fii-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fii-layer = "hardknott honister"
+LAYERSERIES_COMPAT_fii-layer = "honister kirkstone"
diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf
index 09535e9..5e1a6e5 100644
--- a/meta-fii/meta-kudo/conf/layer.conf
+++ b/meta-fii/meta-kudo/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "kudo-layer"
BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_kudo-layer = "hardknott honister"
+LAYERSERIES_COMPAT_kudo-layer = "honister kirkstone"
LAYERDEPENDS_kudo-layer = "core phosphor-layer google-layer fii-layer"
diff --git a/meta-fii/meta-mori/conf/layer.conf b/meta-fii/meta-mori/conf/layer.conf
index bdafaa5..238b5a9 100644
--- a/meta-fii/meta-mori/conf/layer.conf
+++ b/meta-fii/meta-mori/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "mori-layer"
BBFILE_PATTERN_mori-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_mori-layer = "hardknott honister"
+LAYERSERIES_COMPAT_mori-layer = "honister kirkstone"
diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf
index 8048658..e4f0f19 100644
--- a/meta-google/conf/layer.conf
+++ b/meta-google/conf/layer.conf
@@ -14,5 +14,5 @@
BBFILE_COLLECTIONS += "google-layer"
BBFILE_PATTERN_google-layer := "^${LAYERDIR}/"
LAYERVERSION_google-layer = "1"
-LAYERSERIES_COMPAT_google-layer = "hardknott honister"
+LAYERSERIES_COMPAT_google-layer = "honister kirkstone"
LAYERDEPENDS_google-layer += "core phosphor-layer"
diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf
index 1072f7d..dfacc8f 100644
--- a/meta-hpe/conf/layer.conf
+++ b/meta-hpe/conf/layer.conf
@@ -7,7 +7,7 @@
BBFILE_COLLECTIONS += "hpe-layer"
BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/meta-common/"
-LAYERSERIES_COMPAT_hpe-layer = "hardknott honister"
+LAYERSERIES_COMPAT_hpe-layer = "honister kirkstone"
# Provide a variable that points the base of the hpe layer.
HPEBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hpe/meta-dl360poc/conf/layer.conf b/meta-hpe/meta-dl360poc/conf/layer.conf
index 999ad04..a086d3c 100644
--- a/meta-hpe/meta-dl360poc/conf/layer.conf
+++ b/meta-hpe/meta-dl360poc/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "dl360poc-layer"
BBFILE_PATTERN_dl360poc-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_dl360poc-layer = "hardknott honister"
+LAYERSERIES_COMPAT_dl360poc-layer = "honister kirkstone"
diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf
index 7a9a110..567fe84 100644
--- a/meta-hpe/meta-gxp/conf/layer.conf
+++ b/meta-hpe/meta-gxp/conf/layer.conf
@@ -7,6 +7,6 @@
BBFILE_COLLECTIONS += "gxp-layer"
BBFILE_PATTERN_gxp-layer = "^${LAYERDIR}/"
LAYERVERSION_gxp-layer = "1"
-LAYERSERIES_COMPAT_gxp-layer = "hardknott honister"
+LAYERSERIES_COMPAT_gxp-layer = "honister kirkstone"
GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
index 5d49c2d..7853684 100644
--- a/meta-ibm/conf/layer.conf
+++ b/meta-ibm/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "ibm-layer"
BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ibm-layer = "hardknott honister"
+LAYERSERIES_COMPAT_ibm-layer = "honister kirkstone"
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
index e57b1d5..a9050c4 100644
--- a/meta-ibm/meta-palmetto/conf/layer.conf
+++ b/meta-ibm/meta-palmetto/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "palmetto-layer"
BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_palmetto-layer = "hardknott honister"
+LAYERSERIES_COMPAT_palmetto-layer = "honister kirkstone"
diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf
index 3651ada..5d85212 100644
--- a/meta-ibm/meta-romulus/conf/layer.conf
+++ b/meta-ibm/meta-romulus/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "romulus-layer"
BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_romulus-layer = "hardknott honister"
+LAYERSERIES_COMPAT_romulus-layer = "honister kirkstone"
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
index 66d991a..48868ba 100644
--- a/meta-ingrasys/conf/layer.conf
+++ b/meta-ingrasys/conf/layer.conf
@@ -3,4 +3,4 @@
BBFILE_COLLECTIONS += "ingrasys"
BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ingrasys = "hardknott honister"
+LAYERSERIES_COMPAT_ingrasys = "honister kirkstone"
diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf
index 6f62318..e482731 100644
--- a/meta-ingrasys/meta-zaius/conf/layer.conf
+++ b/meta-ingrasys/meta-zaius/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "zaius"
BBFILE_PATTERN_zaius := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_zaius = "hardknott honister"
+LAYERSERIES_COMPAT_zaius = "honister kirkstone"
diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf
index 9e1f53f..05f4651 100644
--- a/meta-inspur/conf/layer.conf
+++ b/meta-inspur/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "inspur-layer"
BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_inspur-layer = "hardknott honister"
+LAYERSERIES_COMPAT_inspur-layer = "honister kirkstone"
diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf
index f921ba6..c4e12f2 100644
--- a/meta-inspur/meta-fp5280g2/conf/layer.conf
+++ b/meta-inspur/meta-fp5280g2/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "fp5280g2-layer"
BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fp5280g2-layer = "hardknott honister"
+LAYERSERIES_COMPAT_fp5280g2-layer = "honister kirkstone"
diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf
index 2dcf54c..ba1ebdd 100644
--- a/meta-inspur/meta-on5263m5/conf/layer.conf
+++ b/meta-inspur/meta-on5263m5/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "on5263m5-layer"
BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_on5263m5-layer = "hardknott honister"
+LAYERSERIES_COMPAT_on5263m5-layer = "honister kirkstone"
diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
index f082caf..356a581 100644
--- a/meta-intel-openbmc/conf/layer.conf
+++ b/meta-intel-openbmc/conf/layer.conf
@@ -8,5 +8,5 @@
BBFILE_COLLECTIONS += "intel"
BBFILE_PATTERN_intel = "^${LAYERDIR}/"
LAYERVERSION_intel = "1"
-LAYERSERIES_COMPAT_intel = "hardknott honister"
+LAYERSERIES_COMPAT_intel = "honister kirkstone"
LAYERDEPENDS_intel = "phosphor-layer"
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
index 07e7a83..46d4935 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
+++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "s2600wf"
BBFILE_PATTERN_s2600wf = ""
BBFILE_PRIORITY_s2600wf = "5"
-LAYERSERIES_COMPAT_s2600wf = "hardknott honister"
+LAYERSERIES_COMPAT_s2600wf = "honister kirkstone"
diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf
index e390573..ff581a4 100644
--- a/meta-inventec/conf/layer.conf
+++ b/meta-inventec/conf/layer.conf
@@ -7,7 +7,7 @@
BBFILE_COLLECTIONS += "inventec"
BBFILE_PATTERN_inventec := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_inventec = "hardknott honister"
+LAYERSERIES_COMPAT_inventec = "honister kirkstone"
BBFILE_PRIORITY_inventec = "6"
# Provide a variable that points the base of the hpe layer.
diff --git a/meta-inventec/meta-common/conf/layer.conf b/meta-inventec/meta-common/conf/layer.conf
index 07788f6..6511a3e 100644
--- a/meta-inventec/meta-common/conf/layer.conf
+++ b/meta-inventec/meta-common/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "common"
BBFILE_PATTERN_common = "^${LAYERDIR}/"
BBFILE_PRIORITY_common = "10"
-LAYERSERIES_COMPAT_common = "hardknott honister"
+LAYERSERIES_COMPAT_common = "honister kirkstone"
diff --git a/meta-inventec/meta-transformers/conf/layer.conf b/meta-inventec/meta-transformers/conf/layer.conf
index 35ae68d..93d7000 100755
--- a/meta-inventec/meta-transformers/conf/layer.conf
+++ b/meta-inventec/meta-transformers/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "transformers"
BBFILE_PATTERN_transformers = "^${LAYERDIR}/"
BBFILE_PRIORITY_transformers = "7"
-LAYERSERIES_COMPAT_transformers = "hardknott honister"
+LAYERSERIES_COMPAT_transformers = "honister kirkstone"
diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf
index 26830d3..d8f5062 100644
--- a/meta-nuvoton/conf/layer.conf
+++ b/meta-nuvoton/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "nuvoton-layer"
BBFILE_PATTERN_nuvoton-layer = ""
LAYERVERSION_nuvoton-layer = "1"
-LAYERSERIES_COMPAT_nuvoton-layer = "hardknott honister"
+LAYERSERIES_COMPAT_nuvoton-layer = "honister kirkstone"
diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf
index 9a16ca0..7f17f30 100644
--- a/meta-openpower/conf/layer.conf
+++ b/meta-openpower/conf/layer.conf
@@ -9,4 +9,4 @@
BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/"
LAYERVERSION_openpower-layer = "1"
LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer"
-LAYERSERIES_COMPAT_openpower-layer = "hardknott honister"
+LAYERSERIES_COMPAT_openpower-layer = "honister kirkstone"
diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index 4600291..addb6fc 100644
--- a/meta-phosphor/conf/layer.conf
+++ b/meta-phosphor/conf/layer.conf
@@ -8,7 +8,7 @@
BBFILE_COLLECTIONS += "phosphor-layer"
BBFILE_PATTERN_phosphor-layer := "^${LAYERDIR}/"
LAYERVERSION_phosphor-layer = "1"
-LAYERSERIES_COMPAT_phosphor-layer = "hardknott honister"
+LAYERSERIES_COMPAT_phosphor-layer = "honister kirkstone"
IMAGE_FEATURES[validitems] += "tools-profile"
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index c461069..9773b5a 100644
--- a/meta-quanta/conf/layer.conf
+++ b/meta-quanta/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "quanta-layer"
BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_quanta-layer = "hardknott honister"
+LAYERSERIES_COMPAT_quanta-layer = "honister kirkstone"
LAYERDEPENDS_quanta-layer = "phosphor-layer"
diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index 021711a..ed048aa 100644
--- a/meta-quanta/meta-f0b/conf/layer.conf
+++ b/meta-quanta/meta-f0b/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "f0b-layer"
BBFILE_PATTERN_f0b-layer = ""
-LAYERSERIES_COMPAT_f0b-layer = "hardknott honister"
+LAYERSERIES_COMPAT_f0b-layer = "honister kirkstone"
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index cd2ca1d..6773198 100644
--- a/meta-quanta/meta-gbs/conf/layer.conf
+++ b/meta-quanta/meta-gbs/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "gbs-layer"
BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gbs-layer = "hardknott honister"
+LAYERSERIES_COMPAT_gbs-layer = "honister kirkstone"
LAYERDEPENDS_gbs-layer = "core phosphor-layer google-layer quanta-layer"
diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf
index 372fb65..4254a7a 100644
--- a/meta-quanta/meta-gsj/conf/layer.conf
+++ b/meta-quanta/meta-gsj/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "gsj-layer"
BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gsj-layer = "hardknott honister"
+LAYERSERIES_COMPAT_gsj-layer = "honister kirkstone"
LAYERDEPENDS_gsj-layer = "core phosphor-layer google-layer quanta-layer"
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
index e78bf95..0cffd89 100644
--- a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
+++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "olympus-nuvoton-layer"
BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_olympus-nuvoton-layer = "hardknott honister"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "honister kirkstone"
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
index 9919453..180d4fa 100644
--- a/meta-quanta/meta-q71l/conf/layer.conf
+++ b/meta-quanta/meta-q71l/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "q71l"
BBFILE_PATTERN_q71l = ""
-LAYERSERIES_COMPAT_q71l = "hardknott honister"
+LAYERSERIES_COMPAT_q71l = "honister kirkstone"
diff --git a/meta-quanta/meta-s6q/conf/layer.conf b/meta-quanta/meta-s6q/conf/layer.conf
index fe35953..0236823 100644
--- a/meta-quanta/meta-s6q/conf/layer.conf
+++ b/meta-quanta/meta-s6q/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "s6q-layer"
BBFILE_PATTERN_s6q-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_s6q-layer := "hardknott honister"
+LAYERSERIES_COMPAT_s6q-layer := "honister kirkstone"
diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf
index a5142e2..435f64b 100644
--- a/meta-supermicro/conf/layer.conf
+++ b/meta-supermicro/conf/layer.conf
@@ -8,6 +8,6 @@
BBFILE_COLLECTIONS += "supermicro"
BBFILE_PATTERN_supermicro = "^${LAYERDIR}/"
LAYERVERSION_supermicro = "1"
-LAYERSERIES_COMPAT_supermicro = "hardknott honister"
+LAYERSERIES_COMPAT_supermicro = "honister kirkstone"
LAYERDEPENDS_supermicro = "phosphor-layer"
diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf
index da61bc1..b4ebb00 100644
--- a/meta-supermicro/meta-x11spi/conf/layer.conf
+++ b/meta-supermicro/meta-x11spi/conf/layer.conf
@@ -9,5 +9,5 @@
BBFILE_PATTERN_x11spi = ""
BBFILE_PRIORITY_x11spi = "5"
-LAYERSERIES_COMPAT_x11spi = "hardknott honister"
+LAYERSERIES_COMPAT_x11spi = "honister kirkstone"
diff --git a/meta-tyan/conf/layer.conf b/meta-tyan/conf/layer.conf
index e0bd4ca..47e9405 100644
--- a/meta-tyan/conf/layer.conf
+++ b/meta-tyan/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "tyan-layer"
BBFILE_PATTERN_tyan-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_tyan-layer = "hardknott honister"
+LAYERSERIES_COMPAT_tyan-layer = "honister kirkstone"
diff --git a/meta-tyan/meta-s7106/conf/layer.conf b/meta-tyan/meta-s7106/conf/layer.conf
index dae8f08..86fde96 100644
--- a/meta-tyan/meta-s7106/conf/layer.conf
+++ b/meta-tyan/meta-s7106/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "s7106-layer"
BBFILE_PATTERN_s7106-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_s7106-layer = "5"
-LAYERSERIES_COMPAT_s7106-layer = "hardknott honister"
+LAYERSERIES_COMPAT_s7106-layer = "honister kirkstone"
diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf
index b291db8..45d1182 100644
--- a/meta-yadro/conf/layer.conf
+++ b/meta-yadro/conf/layer.conf
@@ -9,4 +9,4 @@
BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/"
BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1"
-LAYERSERIES_COMPAT_yadro-layer = "hardknott honister"
+LAYERSERIES_COMPAT_yadro-layer = "honister kirkstone"
diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf
index 1382027..412223b 100644
--- a/meta-yadro/meta-nicole/conf/layer.conf
+++ b/meta-yadro/meta-nicole/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "nicole-layer"
BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_nicole-layer = "hardknott honister"
+LAYERSERIES_COMPAT_nicole-layer = "honister kirkstone"
diff --git a/meta-yadro/meta-vegman/conf/layer.conf b/meta-yadro/meta-vegman/conf/layer.conf
index 0924bdb..22efbe3 100644
--- a/meta-yadro/meta-vegman/conf/layer.conf
+++ b/meta-yadro/meta-vegman/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "vegman-layer"
BBFILE_PATTERN_vegman-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_vegman-layer := "hardknott honister"
+LAYERSERIES_COMPAT_vegman-layer := "honister kirkstone"