From 949645e577d68c1e11b53e82df0459629bf4bddd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Apr 2011 00:11:13 +0100 Subject: 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 --- meta/classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/sanity.bbclass') diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 2f3357bf74..d1770e2f68 100644 --- 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" -- cgit v1.2.3-54-g00ecf