summaryrefslogtreecommitdiffstats
path: root/meta/classes/sanity.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/sanity.bbclass')
-rw-r--r--meta/classes/sanity.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index d1770e2f68..df5a872103 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -101,7 +101,7 @@ def check_sanity(e):
101 # various classes 101 # various classes
102 import sys 102 import sys
103 if sys.hexversion < 0x020600F0: 103 if sys.hexversion < 0x020600F0:
104 messages = messages + 'Poky requires at least Python 2.6 to run. Please update your Python interpreter.\n' 104 messages = messages + 'The system requires at least Python 2.6 to run. Please update your Python interpreter.\n'
105 105
106 if (LooseVersion(__version__) < LooseVersion(minversion)): 106 if (LooseVersion(__version__) < LooseVersion(minversion)):
107 messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__) 107 messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__)
@@ -119,20 +119,20 @@ def check_sanity(e):
119 conf_version = data.getVar('LOCALCONF_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 + "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"
123 123
124 # Check bblayers.conf is valid 124 # Check bblayers.conf is valid
125 current_lconf = data.getVar('LCONF_VERSION', e.data, True) 125 current_lconf = data.getVar('LCONF_VERSION', e.data, True)
126 lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True) 126 lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True)
127 if current_lconf != lconf_version: 127 if current_lconf != lconf_version:
128 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" 128 messages = messages + "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"
129 129
130 # If we have a site.conf, check it's valid 130 # If we have a site.conf, check it's valid
131 if check_conf_exists("conf/site.conf", e.data): 131 if check_conf_exists("conf/site.conf", e.data):
132 current_sconf = data.getVar('SCONF_VERSION', e.data, True) 132 current_sconf = data.getVar('SCONF_VERSION', e.data, True)
133 sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True) 133 sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True)
134 if current_sconf != sconf_version: 134 if current_sconf != sconf_version:
135 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" 135 messages = messages + "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"
136 136
137 assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split() 137 assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split()
138 # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf 138 # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
@@ -334,9 +334,9 @@ def check_sanity(e):
334 334
335 oeroot = data.getVar('COREBASE', e.data) 335 oeroot = data.getVar('COREBASE', e.data)
336 if oeroot.find ('+') != -1: 336 if oeroot.find ('+') != -1:
337 messages = messages + "Error, you have an invalid character (+) in your COREBASE directory path. Please move Poky to a directory which doesn't include a +." 337 messages = messages + "Error, you have an invalid character (+) in your COREBASE directory path. Please move the installation to a directory which doesn't include a +."
338 elif oeroot.find (' ') != -1: 338 elif oeroot.find (' ') != -1:
339 messages = messages + "Error, you have a space in your COREBASE directory path. Please move Poky to a directory which doesn't include a space." 339 messages = messages + "Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space."
340 340
341 # Check that we don't have duplicate entries in PACKAGE_ARCHS 341 # Check that we don't have duplicate entries in PACKAGE_ARCHS
342 pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True) 342 pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True)