summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-06-07 16:10:48 +0100
committerJoshua Lock <josh@linux.intel.com>2010-06-07 16:16:35 +0100
commitc4a0b5463d1fe7cbc605ae95e00d53cbc14903c2 (patch)
treebeb233cae01ee5e7a15f8fe7c4d3ef5c9b33f183 /meta
parentcab1009b08012cc292d9740cf6e3b0f09a29d74f (diff)
downloadpoky-c4a0b5463d1fe7cbc605ae95e00d53cbc14903c2.tar.gz
sanity.bbclass: version each of the files in the build/conf/ directory
We already have versioning of the local.conf file but it's entirely plausible for the bblayers.conf and site.conf to change incompatibly so we should version those too. Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sanity.bbclass21
-rw-r--r--meta/conf/sanity.conf4
2 files changed, 20 insertions, 5 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index ab929ad61d..8ed8975edd 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -54,12 +54,25 @@ def check_sanity(e):
54 if data.getVar('TARGET_OS', e.data, True) == 'INVALID': 54 if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
55 messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n' 55 messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n'
56 56
57 # Check we are using a valid conf setup 57 # Check we are using a valid lacal.conf
58 current_conf = data.getVar('CONF_VERSION', e.data, True) 58 current_conf = data.getVar('CONF_VERSION', e.data, True)
59 conf_version = data.getVar('POKY_CONF_VERSION', e.data, True) 59 conf_version = data.getVar('POKY_CONF_VERSION', e.data, True)
60 60
61 if current_conf != conf_version: 61 if current_conf != conf_version:
62 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" 62 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"
63
64 # Check bblayers.conf is valid
65 current_lconf = data.getVar('LCONF_VERSION', e.data, True)
66 lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True)
67 if current_lconf != lconf_version:
68 messages = messages + "Poky has noticed your version of bblayers.conf was generated from an older version of bblayers.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/bblayers.conf conf/bblayers.conf.sample\" is a good way to visualise the changes.\n"
69
70 # If we have a site.conf, check it's valid
71 if check_conf_exists("conf/site.conf", e.data):
72 current_sconf = data.getVar('SCONF_VERSION', e.data, True)
73 sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True)
74 if current_sconf != sconf_version:
75 messages = messages + "Poky has noticed your version of site.conf was generated from an older version of site.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/site.conf conf/site.conf.sample\" is a good way to visualise the changes.\n"
63 76
64 assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split() 77 assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split()
65 # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf 78 # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index c9d77794cf..abe5eee01e 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -7,7 +7,9 @@ BB_MIN_VERSION = "1.8.10"
7 7
8SANITY_ABIFILE = "${TMPDIR}/abi_version" 8SANITY_ABIFILE = "${TMPDIR}/abi_version"
9 9
10POKY_CONF_VERSION = "1" 10POKY_CONF_VERSION = "1"
11LAYER_CONF_VERSION = "1"
12SITE_CONF_VERSION = "1"
11 13
12INHERIT += "sanity" 14INHERIT += "sanity"
13 15