diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/sanity.bbclass | 7 | ||||
| -rw-r--r-- | meta/conf/sanity.conf | 2 |
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() { sanity_conf_update(bblayers_fn, lines, 'LCONF_VERSION', current_lconf) return + elif current_lconf == 5 and lconf_version > 5: + # Null update, to avoid issues with people switching between poky and other distros + current_lconf = 6 + sanity_conf_update(bblayers_fn, lines, 'LCONF_VERSION', current_lconf) + return + sys.exit() } @@ -470,7 +476,6 @@ def sanity_check_conffiles(status, d): if success: bb.note("Your conf/bblayers.conf has been automatically updated.") status.reparse = True - break if not status.reparse: 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)) 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" SANITY_VERSION ?= "1" LOCALCONF_VERSION ?= "1" -LAYER_CONF_VERSION ?= "5" +LAYER_CONF_VERSION ?= "6" SITE_CONF_VERSION ?= "1" INHERIT += "sanity" |