summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sanity.bbclass7
-rw-r--r--meta/conf/sanity.conf2
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 2f75558104..31b99d4bc8 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -70,6 +70,12 @@ python oecore_update_bblayers() {
70 sanity_conf_update(bblayers_fn, lines, 'LCONF_VERSION', current_lconf) 70 sanity_conf_update(bblayers_fn, lines, 'LCONF_VERSION', current_lconf)
71 return 71 return
72 72
73 elif current_lconf == 5 and lconf_version > 5:
74 # Null update, to avoid issues with people switching between poky and other distros
75 current_lconf = 6
76 sanity_conf_update(bblayers_fn, lines, 'LCONF_VERSION', current_lconf)
77 return
78
73 sys.exit() 79 sys.exit()
74} 80}
75 81
@@ -470,7 +476,6 @@ def sanity_check_conffiles(status, d):
470 if success: 476 if success:
471 bb.note("Your conf/bblayers.conf has been automatically updated.") 477 bb.note("Your conf/bblayers.conf has been automatically updated.")
472 status.reparse = True 478 status.reparse = True
473 break
474 if not status.reparse: 479 if not status.reparse:
475 status.addresult("Your version of bblayers.conf has the wrong LCONF_VERSION (has %s, expecting %s).\nPlease compare the your file against bblayers.conf.sample and merge any changes before continuing.\n\"meld conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample\" is a good way to visualise the changes.\n" % (current_lconf, lconf_version)) 480 status.addresult("Your version of bblayers.conf has the wrong LCONF_VERSION (has %s, expecting %s).\nPlease compare the your file against bblayers.conf.sample and merge any changes before continuing.\n\"meld conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample\" is a good way to visualise the changes.\n" % (current_lconf, lconf_version))
476 481
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index 1d55fa71d9..669b8ba866 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -9,7 +9,7 @@ SANITY_ABIFILE = "${TMPDIR}/abi_version"
9 9
10SANITY_VERSION ?= "1" 10SANITY_VERSION ?= "1"
11LOCALCONF_VERSION ?= "1" 11LOCALCONF_VERSION ?= "1"
12LAYER_CONF_VERSION ?= "5" 12LAYER_CONF_VERSION ?= "6"
13SITE_CONF_VERSION ?= "1" 13SITE_CONF_VERSION ?= "1"
14 14
15INHERIT += "sanity" 15INHERIT += "sanity"