summaryrefslogtreecommitdiffstats
path: root/meta/classes-global/sanity.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes-global/sanity.bbclass')
-rw-r--r--meta/classes-global/sanity.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass
index c90fc84b76..2d1ff7072c 100644
--- a/meta/classes-global/sanity.bbclass
+++ b/meta/classes-global/sanity.bbclass
@@ -42,7 +42,7 @@ BBLAYERS_CONF_UPDATE_FUNCS += " \
42 42
43SANITY_DIFF_TOOL ?= "meld" 43SANITY_DIFF_TOOL ?= "meld"
44 44
45SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/local.conf.sample" 45SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/local.conf.sample"
46python oecore_update_localconf() { 46python oecore_update_localconf() {
47 # Check we are using a valid local.conf 47 # Check we are using a valid local.conf
48 current_conf = d.getVar('CONF_VERSION') 48 current_conf = d.getVar('CONF_VERSION')
@@ -62,7 +62,7 @@ is a good way to visualise the changes."""
62 raise NotImplementedError(failmsg) 62 raise NotImplementedError(failmsg)
63} 63}
64 64
65SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/site.conf.sample" 65SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/site.conf.sample"
66python oecore_update_siteconf() { 66python oecore_update_siteconf() {
67 # If we have a site.conf, check it's valid 67 # If we have a site.conf, check it's valid
68 current_sconf = d.getVar('SCONF_VERSION') 68 current_sconf = d.getVar('SCONF_VERSION')
@@ -82,7 +82,7 @@ is a good way to visualise the changes."""
82 raise NotImplementedError(failmsg) 82 raise NotImplementedError(failmsg)
83} 83}
84 84
85SANITY_BBLAYERCONF_SAMPLE ?= "${COREBASE}/meta*/conf/bblayers.conf.sample" 85SANITY_BBLAYERCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/bblayers.conf.sample"
86python oecore_update_bblayers() { 86python oecore_update_bblayers() {
87 # bblayers.conf is out of date, so see if we can resolve that 87 # bblayers.conf is out of date, so see if we can resolve that
88 88