79 files changed, 3 insertions, 3 deletions
diff --git a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample b/meta-amd/meta-ethanolx/conf/templates/default/bblayers.conf.sample
index 2703e31eb0..2703e31eb0 100644
--- a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample
+++ b/meta-amd/meta-ethanolx/conf/templates/default/bblayers.conf.sample
diff --git a/meta-amd/meta-ethanolx/conf/local.conf.sample b/meta-amd/meta-ethanolx/conf/templates/default/local.conf.sample
index cdc6cef77e..cdc6cef77e 100644
--- a/meta-amd/meta-ethanolx/conf/local.conf.sample
+++ b/meta-amd/meta-ethanolx/conf/templates/default/local.conf.sample
diff --git a/meta-ampere/meta-jade/conf/bblayers.conf.sample b/meta-ampere/meta-jade/conf/templates/default/bblayers.conf.sample
index e54c704bec..e54c704bec 100644
--- a/meta-ampere/meta-jade/conf/bblayers.conf.sample
+++ b/meta-ampere/meta-jade/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ampere/meta-jade/conf/local.conf.sample b/meta-ampere/meta-jade/conf/templates/default/local.conf.sample
index 4fb2cbd6c3..4fb2cbd6c3 100644
--- a/meta-ampere/meta-jade/conf/local.conf.sample
+++ b/meta-ampere/meta-jade/conf/templates/default/local.conf.sample
diff --git a/meta-aspeed/conf/bblayers.conf.sample b/meta-aspeed/conf/templates/default/bblayers.conf.sample
index e52e6beac8..e52e6beac8 100644
--- a/meta-aspeed/conf/bblayers.conf.sample
+++ b/meta-aspeed/conf/templates/default/bblayers.conf.sample
diff --git a/meta-aspeed/conf/local.conf.sample b/meta-aspeed/conf/templates/default/local.conf.sample
index 9cce692887..9cce692887 100644
--- a/meta-aspeed/conf/local.conf.sample
+++ b/meta-aspeed/conf/templates/default/local.conf.sample
diff --git a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample b/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
index 409a775a83..409a775a83 100644
--- a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample
+++ b/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
diff --git a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/templates/default/local.conf.sample
index a8066b3d82..a8066b3d82 100644
--- a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
+++ b/meta-asrock/meta-e3c246d4i/conf/templates/default/local.conf.sample
diff --git a/meta-asrock/meta-romed8hm3/conf/bblayers.conf.sample b/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample
index fe3ebafe49..fe3ebafe49 100644
--- a/meta-asrock/meta-romed8hm3/conf/bblayers.conf.sample
+++ b/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample
diff --git a/meta-asrock/meta-romed8hm3/conf/local.conf.sample b/meta-asrock/meta-romed8hm3/conf/templates/default/local.conf.sample
index a38ebba1ba..a38ebba1ba 100644
--- a/meta-asrock/meta-romed8hm3/conf/local.conf.sample
+++ b/meta-asrock/meta-romed8hm3/conf/templates/default/local.conf.sample
diff --git a/meta-bytedance/meta-g220a/conf/bblayers.conf.sample b/meta-bytedance/meta-g220a/conf/templates/default/bblayers.conf.sample
index fbc725d091..fbc725d091 100644
--- a/meta-bytedance/meta-g220a/conf/bblayers.conf.sample
+++ b/meta-bytedance/meta-g220a/conf/templates/default/bblayers.conf.sample
diff --git a/meta-bytedance/meta-g220a/conf/local.conf.sample b/meta-bytedance/meta-g220a/conf/templates/default/local.conf.sample
index 95e52585b9..95e52585b9 100644
--- a/meta-bytedance/meta-g220a/conf/local.conf.sample
+++ b/meta-bytedance/meta-g220a/conf/templates/default/local.conf.sample
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample
index 08b767f491..08b767f491 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/local.conf.sample
index 351a272e1c..351a272e1c 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/local.conf.sample
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample
index 04e4ebbaa6..04e4ebbaa6 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/local.conf.sample
index 7da9adf3f6..7da9adf3f6 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/local.conf.sample
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample
index 25854dc74f..25854dc74f 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/local.conf.sample
index 1c351700ed..1c351700ed 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/local.conf.sample
diff --git a/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample
index e6405c50c2..e6405c50c2 100644
--- a/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample
+++ b/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample
diff --git a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/templates/default/local.conf.sample
index 86d2c78ad3..86d2c78ad3 100644
--- a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample
+++ b/meta-evb/meta-evb-raspberrypi/conf/templates/default/local.conf.sample
diff --git a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
index e15c7b25e2..e15c7b25e2 100644
--- a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample
+++ b/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
diff --git a/meta-facebook/meta-bletchley/conf/local.conf.sample b/meta-facebook/meta-bletchley/conf/templates/default/local.conf.sample
index 17faa4a5e6..17faa4a5e6 100644
--- a/meta-facebook/meta-bletchley/conf/local.conf.sample
+++ b/meta-facebook/meta-bletchley/conf/templates/default/local.conf.sample
diff --git a/meta-facebook/meta-greatlakes/conf/bblayers.conf.sample b/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample
index ce12406418..ce12406418 100644
--- a/meta-facebook/meta-greatlakes/conf/bblayers.conf.sample
+++ b/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample
diff --git a/meta-facebook/meta-greatlakes/conf/local.conf.sample b/meta-facebook/meta-greatlakes/conf/templates/default/local.conf.sample
index 6f86dcfedf..6f86dcfedf 100644
--- a/meta-facebook/meta-greatlakes/conf/local.conf.sample
+++ b/meta-facebook/meta-greatlakes/conf/templates/default/local.conf.sample
diff --git a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample b/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample
index 33f0d49103..33f0d49103 100644
--- a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample
+++ b/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample
diff --git a/meta-facebook/meta-tiogapass/conf/local.conf.sample b/meta-facebook/meta-tiogapass/conf/templates/default/local.conf.sample
index 2786d161fc..2786d161fc 100644
--- a/meta-facebook/meta-tiogapass/conf/local.conf.sample
+++ b/meta-facebook/meta-tiogapass/conf/templates/default/local.conf.sample
diff --git a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample
index a655f24355..a655f24355 100644
--- a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample
+++ b/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample
diff --git a/meta-facebook/meta-yosemitev2/conf/local.conf.sample b/meta-facebook/meta-yosemitev2/conf/templates/default/local.conf.sample
index 562d2f3268..562d2f3268 100644
--- a/meta-facebook/meta-yosemitev2/conf/local.conf.sample
+++ b/meta-facebook/meta-yosemitev2/conf/templates/default/local.conf.sample
diff --git a/meta-fii/meta-kudo/conf/bblayers.conf.sample b/meta-fii/meta-kudo/conf/templates/default/bblayers.conf.sample
index cb2e67016e..cb2e67016e 100644
--- a/meta-fii/meta-kudo/conf/bblayers.conf.sample
+++ b/meta-fii/meta-kudo/conf/templates/default/bblayers.conf.sample
diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/templates/default/local.conf.sample
index fc4d82b43d..fc4d82b43d 100644
--- a/meta-fii/meta-kudo/conf/local.conf.sample
+++ b/meta-fii/meta-kudo/conf/templates/default/local.conf.sample
diff --git a/meta-fii/meta-mori/conf/bblayers.conf.sample b/meta-fii/meta-mori/conf/templates/default/bblayers.conf.sample
index 6d45954705..6d45954705 100644
--- a/meta-fii/meta-mori/conf/bblayers.conf.sample
+++ b/meta-fii/meta-mori/conf/templates/default/bblayers.conf.sample
diff --git a/meta-fii/meta-mori/conf/local.conf.sample b/meta-fii/meta-mori/conf/templates/default/local.conf.sample
index b7fd499b5c..b7fd499b5c 100644
--- a/meta-fii/meta-mori/conf/local.conf.sample
+++ b/meta-fii/meta-mori/conf/templates/default/local.conf.sample
diff --git a/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample b/meta-hpe/meta-dl360poc/conf/templates/default/bblayers.conf.sample
index 93bd47240d..93bd47240d 100644
--- a/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample
+++ b/meta-hpe/meta-dl360poc/conf/templates/default/bblayers.conf.sample
diff --git a/meta-hpe/meta-dl360poc/conf/local.conf.sample b/meta-hpe/meta-dl360poc/conf/templates/default/local.conf.sample
index b6fb462da4..b6fb462da4 100644
--- a/meta-hpe/meta-dl360poc/conf/local.conf.sample
+++ b/meta-hpe/meta-dl360poc/conf/templates/default/local.conf.sample
diff --git a/meta-ibm/conf/bblayers.conf.sample b/meta-ibm/conf/templates/default/bblayers.conf.sample
index 9ce105376d..9ce105376d 100644
--- a/meta-ibm/conf/bblayers.conf.sample
+++ b/meta-ibm/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/templates/default/local.conf.sample
index f73f5d5af9..f73f5d5af9 100644
--- a/meta-ibm/conf/local.conf.sample
+++ b/meta-ibm/conf/templates/default/local.conf.sample
diff --git a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-ibm/meta-palmetto/conf/templates/default/bblayers.conf.sample
index d2709ded4a..d2709ded4a 100644
--- a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
+++ b/meta-ibm/meta-palmetto/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-ibm/meta-palmetto/conf/templates/default/local.conf.sample
index dec7ef4237..dec7ef4237 100644
--- a/meta-ibm/meta-palmetto/conf/local.conf.sample
+++ b/meta-ibm/meta-palmetto/conf/templates/default/local.conf.sample
diff --git a/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-ibm/meta-romulus/conf/templates/default/bblayers.conf.sample
index 4c66cca88b..4c66cca88b 100644
--- a/meta-ibm/meta-romulus/conf/bblayers.conf.sample
+++ b/meta-ibm/meta-romulus/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-ibm/meta-romulus/conf/templates/default/local.conf.sample
index 61e8504902..61e8504902 100644
--- a/meta-ibm/meta-romulus/conf/local.conf.sample
+++ b/meta-ibm/meta-romulus/conf/templates/default/local.conf.sample
diff --git a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-ingrasys/meta-zaius/conf/templates/default/bblayers.conf.sample
index 2829d2bd71..2829d2bd71 100644
--- a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
+++ b/meta-ingrasys/meta-zaius/conf/templates/default/bblayers.conf.sample
diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/templates/default/local.conf.sample
index c1f13abcd1..c1f13abcd1 100644
--- a/meta-ingrasys/meta-zaius/conf/local.conf.sample
+++ b/meta-ingrasys/meta-zaius/conf/templates/default/local.conf.sample
diff --git a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample b/meta-inspur/meta-fp5280g2/conf/templates/default/bblayers.conf.sample
index eaabcce7a3..eaabcce7a3 100644
--- a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample
+++ b/meta-inspur/meta-fp5280g2/conf/templates/default/bblayers.conf.sample
diff --git a/meta-inspur/meta-fp5280g2/conf/local.conf.sample b/meta-inspur/meta-fp5280g2/conf/templates/default/local.conf.sample
index 6558d8b911..6558d8b911 100644
--- a/meta-inspur/meta-fp5280g2/conf/local.conf.sample
+++ b/meta-inspur/meta-fp5280g2/conf/templates/default/local.conf.sample
diff --git a/meta-inspur/meta-on5263m5/conf/bblayers.conf.sample b/meta-inspur/meta-on5263m5/conf/templates/default/bblayers.conf.sample
index 06c4568028..06c4568028 100644
--- a/meta-inspur/meta-on5263m5/conf/bblayers.conf.sample
+++ b/meta-inspur/meta-on5263m5/conf/templates/default/bblayers.conf.sample
diff --git a/meta-inspur/meta-on5263m5/conf/local.conf.sample b/meta-inspur/meta-on5263m5/conf/templates/default/local.conf.sample
index 4693038e9e..4693038e9e 100644
--- a/meta-inspur/meta-on5263m5/conf/local.conf.sample
+++ b/meta-inspur/meta-on5263m5/conf/templates/default/local.conf.sample
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample
index aeedde9bff..aeedde9bff 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
+++ b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/local.conf.sample
index 85c6d5ee72..85c6d5ee72 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample
+++ b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/local.conf.sample
diff --git a/meta-inventec/meta-transformers/conf/bblayers.conf.sample b/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample
index 72d1ffec07..72d1ffec07 100755
--- a/meta-inventec/meta-transformers/conf/bblayers.conf.sample
+++ b/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample
diff --git a/meta-inventec/meta-transformers/conf/local.conf.sample b/meta-inventec/meta-transformers/conf/templates/default/local.conf.sample
index c48b3fcbc9..c48b3fcbc9 100755
--- a/meta-inventec/meta-transformers/conf/local.conf.sample
+++ b/meta-inventec/meta-transformers/conf/templates/default/local.conf.sample
diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/templates/default/bblayers.conf.sample
index 53243e32b9..53243e32b9 100644
--- a/meta-phosphor/conf/bblayers.conf.sample
+++ b/meta-phosphor/conf/templates/default/bblayers.conf.sample
diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/templates/default/local.conf.sample
index b24f032647..b24f032647 100644
--- a/meta-phosphor/conf/local.conf.sample
+++ b/meta-phosphor/conf/templates/default/local.conf.sample
diff --git a/meta-qualcomm/conf/bblayers.conf.sample b/meta-qualcomm/conf/templates/default/bblayers.conf.sample
index c4544fbcc2..c4544fbcc2 100644
--- a/meta-qualcomm/conf/bblayers.conf.sample
+++ b/meta-qualcomm/conf/templates/default/bblayers.conf.sample
diff --git a/meta-qualcomm/conf/local.conf.sample b/meta-qualcomm/conf/templates/default/local.conf.sample
index 081fcc673c..081fcc673c 100644
--- a/meta-qualcomm/conf/local.conf.sample
+++ b/meta-qualcomm/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-f0b/conf/bblayers.conf.sample b/meta-quanta/meta-f0b/conf/templates/default/bblayers.conf.sample
index a2f91f4ee9..a2f91f4ee9 100644
--- a/meta-quanta/meta-f0b/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-f0b/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-f0b/conf/local.conf.sample b/meta-quanta/meta-f0b/conf/templates/default/local.conf.sample
index 69c77116cd..69c77116cd 100644
--- a/meta-quanta/meta-f0b/conf/local.conf.sample
+++ b/meta-quanta/meta-f0b/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-gbs/conf/bblayers.conf.sample b/meta-quanta/meta-gbs/conf/templates/default/bblayers.conf.sample
index 8d53ae3664..8d53ae3664 100644
--- a/meta-quanta/meta-gbs/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-gbs/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-gbs/conf/local.conf.sample b/meta-quanta/meta-gbs/conf/templates/default/local.conf.sample
index 7125616ce3..7125616ce3 100644
--- a/meta-quanta/meta-gbs/conf/local.conf.sample
+++ b/meta-quanta/meta-gbs/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-gsj/conf/bblayers.conf.sample b/meta-quanta/meta-gsj/conf/templates/default/bblayers.conf.sample
index 5c505ff528..5c505ff528 100644
--- a/meta-quanta/meta-gsj/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-gsj/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/templates/default/local.conf.sample
index 95664912fb..95664912fb 100644
--- a/meta-quanta/meta-gsj/conf/local.conf.sample
+++ b/meta-quanta/meta-gsj/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/templates/default/bblayers.conf.sample
index dba4339dfc..dba4339dfc 100644
--- a/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-olympus-nuvoton/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/templates/default/local.conf.sample
index 6a70da03f8..6a70da03f8 100644
--- a/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample
+++ b/meta-quanta/meta-olympus-nuvoton/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-quanta/meta-q71l/conf/templates/default/bblayers.conf.sample
index c61088ad89..c61088ad89 100644
--- a/meta-quanta/meta-q71l/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-q71l/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-q71l/conf/local.conf.sample b/meta-quanta/meta-q71l/conf/templates/default/local.conf.sample
index 5febc77429..5febc77429 100644
--- a/meta-quanta/meta-q71l/conf/local.conf.sample
+++ b/meta-quanta/meta-q71l/conf/templates/default/local.conf.sample
diff --git a/meta-quanta/meta-s6q/conf/bblayers.conf.sample b/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample
index 3118d5068e..3118d5068e 100644
--- a/meta-quanta/meta-s6q/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample
diff --git a/meta-quanta/meta-s6q/conf/local.conf.sample b/meta-quanta/meta-s6q/conf/templates/default/local.conf.sample
index eb2fe7a9d3..eb2fe7a9d3 100644
--- a/meta-quanta/meta-s6q/conf/local.conf.sample
+++ b/meta-quanta/meta-s6q/conf/templates/default/local.conf.sample
diff --git a/meta-supermicro/meta-x11spi/conf/bblayers.conf.sample b/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample
index 09488d4dd2..09488d4dd2 100644
--- a/meta-supermicro/meta-x11spi/conf/bblayers.conf.sample
+++ b/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample
diff --git a/meta-supermicro/meta-x11spi/conf/local.conf.sample b/meta-supermicro/meta-x11spi/conf/templates/default/local.conf.sample
index 584e6585a3..584e6585a3 100644
--- a/meta-supermicro/meta-x11spi/conf/local.conf.sample
+++ b/meta-supermicro/meta-x11spi/conf/templates/default/local.conf.sample
diff --git a/meta-tyan/meta-s7106/conf/bblayers.conf.sample b/meta-tyan/meta-s7106/conf/templates/default/bblayers.conf.sample
index 78e42726a7..78e42726a7 100644
--- a/meta-tyan/meta-s7106/conf/bblayers.conf.sample
+++ b/meta-tyan/meta-s7106/conf/templates/default/bblayers.conf.sample
diff --git a/meta-tyan/meta-s7106/conf/local.conf.sample b/meta-tyan/meta-s7106/conf/templates/default/local.conf.sample
index 6a21206133..6a21206133 100644
--- a/meta-tyan/meta-s7106/conf/local.conf.sample
+++ b/meta-tyan/meta-s7106/conf/templates/default/local.conf.sample
diff --git a/meta-tyan/meta-s8036/conf/bblayers.conf.sample b/meta-tyan/meta-s8036/conf/templates/default/bblayers.conf.sample
index 12f457b74b..12f457b74b 100644
--- a/meta-tyan/meta-s8036/conf/bblayers.conf.sample
+++ b/meta-tyan/meta-s8036/conf/templates/default/bblayers.conf.sample
diff --git a/meta-tyan/meta-s8036/conf/local.conf.sample b/meta-tyan/meta-s8036/conf/templates/default/local.conf.sample
index 1cd5e9e910..1cd5e9e910 100644
--- a/meta-tyan/meta-s8036/conf/local.conf.sample
+++ b/meta-tyan/meta-s8036/conf/templates/default/local.conf.sample
diff --git a/meta-wistron/meta-lannister/conf/bblayers.conf.sample b/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample
index 65e21c9082..65e21c9082 100644
--- a/meta-wistron/meta-lannister/conf/bblayers.conf.sample
+++ b/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample
diff --git a/meta-wistron/meta-lannister/conf/local.conf.sample b/meta-wistron/meta-lannister/conf/templates/default/local.conf.sample
index e0c0ca5280..e0c0ca5280 100644
--- a/meta-wistron/meta-lannister/conf/local.conf.sample
+++ b/meta-wistron/meta-lannister/conf/templates/default/local.conf.sample
diff --git a/meta-yadro/meta-nicole/conf/bblayers.conf.sample b/meta-yadro/meta-nicole/conf/templates/default/bblayers.conf.sample
index a5a0110ab6..a5a0110ab6 100644
--- a/meta-yadro/meta-nicole/conf/bblayers.conf.sample
+++ b/meta-yadro/meta-nicole/conf/templates/default/bblayers.conf.sample
diff --git a/meta-yadro/meta-nicole/conf/local.conf.sample b/meta-yadro/meta-nicole/conf/templates/default/local.conf.sample
index 65875b07b4..65875b07b4 100644
--- a/meta-yadro/meta-nicole/conf/local.conf.sample
+++ b/meta-yadro/meta-nicole/conf/templates/default/local.conf.sample
diff --git a/meta-yadro/meta-vegman/conf/bblayers.conf.sample b/meta-yadro/meta-vegman/conf/templates/default/bblayers.conf.sample
index 0eb89a6252..0eb89a6252 100644
--- a/meta-yadro/meta-vegman/conf/bblayers.conf.sample
+++ b/meta-yadro/meta-vegman/conf/templates/default/bblayers.conf.sample
diff --git a/meta-yadro/meta-vegman/conf/local.conf.sample b/meta-yadro/meta-vegman/conf/templates/default/local.conf.sample
index 0dae65bbb2..0dae65bbb2 100644
--- a/meta-yadro/meta-vegman/conf/local.conf.sample
+++ b/meta-yadro/meta-vegman/conf/templates/default/local.conf.sample
diff --git a/setup b/setup
index 08ac4f4604..5152c59850 100755
--- a/setup
+++ b/setup
@@ -62,10 +62,10 @@ machine() {
             tmpl="meta-phosphor/conf"
         else
             # Skip any machines that don't support meta-phosphor.
-            if [ ! -e "$tmpl/bblayers.conf.sample" ]; then
+            if [ ! -e "$tmpl/templates/default/bblayers.conf.sample" ]; then
                 continue
             fi
-            if ! grep -q "##OEROOT##/meta-phosphor" "$tmpl/bblayers.conf.sample"; then
+            if ! grep -q "##OEROOT##/meta-phosphor" "$tmpl/templates/default/bblayers.conf.sample"; then
                 continue
             fi
         fi
@@ -76,7 +76,7 @@ machine() {
             if [ "${name}" = "${target}" ]; then
                 echo "Machine ${target} found in ${tmpl%/conf}"
                 mkdir -p "${build_dir}"
-                TEMPLATECONF="${tmpl}" source \
+                TEMPLATECONF="${tmpl}/templates/default" source \
                         oe-init-build-env "${build_dir}"
 
                 if [ "$(cat conf/templateconf.cfg)" = "${tmpl}" ]; then