summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 23:11:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 23:29:32 (GMT)
commit949645e577d68c1e11b53e82df0459629bf4bddd (patch)
treea96c911fe8c351b4f14f0aa729a42b037ebb2164
parent6af27de9363dbab8a96a29aeb4e87b8e40099f5d (diff)
downloadpoky-949645e577d68c1e11b53e82df0459629bf4bddd.tar.gz
sanity.conf: Rename POKY_CONF_VERSION -> LOCALCONF_VERSION and make sanity versions weak assignment allowing the distro to override
(From OE-Core rev: 9a5a783fb131aef98540a81ea6697031a7a429e0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/conf/sanity.conf8
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 2f3357b..d1770e2 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -116,7 +116,7 @@ def check_sanity(e):
116 116
117 # Check we are using a valid lacal.conf 117 # Check we are using a valid lacal.conf
118 current_conf = data.getVar('CONF_VERSION', e.data, True) 118 current_conf = data.getVar('CONF_VERSION', e.data, True)
119 conf_version = data.getVar('POKY_CONF_VERSION', e.data, True) 119 conf_version = data.getVar('LOCALCONF_VERSION', e.data, True)
120 120
121 if current_conf != conf_version: 121 if current_conf != conf_version:
122 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" 122 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 fcaed11..2ac1735 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -7,10 +7,10 @@ BB_MIN_VERSION = "1.8.10"
7 7
8SANITY_ABIFILE = "${TMPDIR}/abi_version" 8SANITY_ABIFILE = "${TMPDIR}/abi_version"
9 9
10SANITY_VERSION = "1" 10SANITY_VERSION ?= "1"
11POKY_CONF_VERSION = "1" 11LOCALCONF_VERSION ?= "1"
12LAYER_CONF_VERSION = "4" 12LAYER_CONF_VERSION ?= "4"
13SITE_CONF_VERSION = "1" 13SITE_CONF_VERSION ?= "1"
14 14
15INHERIT += "sanity" 15INHERIT += "sanity"
16 16