summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-02-05 12:05:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-23 18:00:20 +0000
commit1bb00223844bfabe1f6d75c8179d4cbbd4fb5466 (patch)
tree9f0b455cb813a866a99538a31bcff0088b7a8584 /meta/conf
parenta509e276b26cf0cfa495e835392ff3e709ed1317 (diff)
downloadpoky-1bb00223844bfabe1f6d75c8179d4cbbd4fb5466.tar.gz
classes/sanity: avoid bblayers version issue when switching between poky and other DISTRO values
If you create a build directory with poky, or set DISTRO to "poky" and run bitbake, you'll get a bblayers.conf file with LCONF_VERSION set to 6. If you then set DISTRO to any other value where the new distro config doesn't pull in poky's config, e.g. "nodistro", you would then get a bblayers.conf version error which didn't immediately make sense. (The layer versions have been out-of-step ever since meta-yocto-bsp was split out of meta-yocto several years ago). This is just painful and we'd rather users didn't have to deal with it. Obviously it isn't an OE-Core problem per se, but a simple way to resolve it for everyone is to bump OE-Core's version to 6 with an automatic no-op upgrade. Also ensure that multiple upgrade functions (such as the poky one) have a chance to execute by not breaking out of the loop as we were before. Fixes [YOCTO #6139]. (From OE-Core rev: 2fdeee2fad69445b0d97148826c7b027820be63a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/sanity.conf2
1 files changed, 1 insertions, 1 deletions
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"