aboutsummaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-16 21:51:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:27:08 +0000
commit10fd24271e771ed12e36edcff0007caa1a4e67e4 (patch)
tree1067fbeb520d64c5675ad0a2c8f0b4ff988b664c /meta/conf
parent8f5429b5e543e122072a51b518cc137dfc8ec442 (diff)
downloadopenembedded-core-contrib-10fd24271e771ed12e36edcff0007caa1a4e67e4.tar.gz
openembedded-core-contrib-10fd24271e771ed12e36edcff0007caa1a4e67e4.tar.bz2
openembedded-core-contrib-10fd24271e771ed12e36edcff0007caa1a4e67e4.zip
sanity: Improve configuration upgrade capabilities (support meta-yocto -> poky transition)
Right now, only one configuration file can be processed (conf/bblayers.conf) and it can only have one version number. This is a cause of immense friction between OE-Core and Poky since if one needs a version change, it shouldn't be forced on the other. We'd like to rename the meta-yocto layer (within the meta-yocto repository) to meta-poky. To do this, we need to correct the bblayers.conf file and that means changing the sanity version. After the pain this caused the last time, Paul made me promise never to have them out of sync between OE-Core and Poky, equally, having every distro changing config update OE-Core isn't scalable either. This patch changes the sanity upgrade method to list a more generic format: <config file>:<current version variable name>:<required version variable name>:<upgrade function> This in theory allows us to support upgrades to any of the core configuration files, and allow layers to extend them as needed. Files with the same name can be handled in different layers by setting a unique version name variable in the file itself. The upgrade code is only called if the version variable is set. To allow us to make the poky name change and use a new configuration file name, one last version bump is included for poky to handle the transition. 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 0f852d140c..0d20c9908e 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 ?= "6"
+LAYER_CONF_VERSION ?= "7"
SITE_CONF_VERSION ?= "1"
INHERIT += "sanity"