sanity.conf: Rename POKY_CONF_VERSION -> LOCALCONF_VERSION and make sanity versions...

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 2f3357bf74adc184f1f386a36bee1147cc8d0457..d1770e2f68465ca1f087f6c68395d3ce8e5a40ba 100644 (file)
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -116,7 +116,7 @@ def check_sanity(e):
 
         # Check we are using a valid lacal.conf
         current_conf  = data.getVar('CONF_VERSION', e.data, True)
-        conf_version =  data.getVar('POKY_CONF_VERSION', e.data, True)
+        conf_version =  data.getVar('LOCALCONF_VERSION', e.data, True)
 
         if current_conf != conf_version:
             messages = messages + "Poky has noticed your version of local.conf was generated from an older version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/local.conf conf/local.conf.sample\" is a good way to visualise the changes.\n"

diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index fcaed11951f2bb9b8f4b00c6de35c8ce19fa8fc3..2ac1735d502ab508f124fde914fc6d1e64a398db 100644 (file)
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -7,10 +7,10 @@ BB_MIN_VERSION = "1.8.10"
 
 SANITY_ABIFILE = "${TMPDIR}/abi_version"
 
-SANITY_VERSION = "1"
-POKY_CONF_VERSION  = "1"
-LAYER_CONF_VERSION = "4"
-SITE_CONF_VERSION  = "1"
+SANITY_VERSION ?= "1"
+LOCALCONF_VERSION  ?= "1"
+LAYER_CONF_VERSION ?= "4"
+SITE_CONF_VERSION  ?= "1"
 
 INHERIT += "sanity"