diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-21 00:11:13 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-21 00:11:13 +0100 |
| commit | 9a5a783fb131aef98540a81ea6697031a7a429e0 (patch) | |
| tree | fc80675ff9f1dcf50951253e3b1d3b5459d208e0 | |
| parent | 372f8c841f715d9e21e7cef4fd4106f1559795a8 (diff) | |
| download | openembedded-core-9a5a783fb131aef98540a81ea6697031a7a429e0.tar.gz openembedded-core-9a5a783fb131aef98540a81ea6697031a7a429e0.tar.bz2 openembedded-core-9a5a783fb131aef98540a81ea6697031a7a429e0.tar.xz openembedded-core-9a5a783fb131aef98540a81ea6697031a7a429e0.zip | |
sanity.conf: Rename POKY_CONF_VERSION -> LOCALCONF_VERSION and make sanity versions weak assignment allowing the distro to override
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/sanity.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/sanity.conf | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 2f3357bf7..d1770e2f6 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" diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf index fcaed1195..2ac1735d5 100644 --- 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" |