summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-21 17:44:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-24 15:41:18 +0100
commitac090ace11d654dafd642fd93c94091a164476fa (patch)
treecf12196a7bfbe79e0af6aaad97709970a238e4ee /meta
parentc6108ebe116eafaf0a22b5f22a3eec87c86859f4 (diff)
downloadopenembedded-core-ac090ace11d654dafd642fd93c94091a164476fa.tar.gz
openembedded-core-ac090ace11d654dafd642fd93c94091a164476fa.tar.bz2
openembedded-core-ac090ace11d654dafd642fd93c94091a164476fa.zip
sanity.bbclass: Drop horrible obsolete minversion hack
We once needed to do this, things seem to work fine without this now, thankfully. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sanity.bbclass9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 3b9934b488..e62000cc16 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -369,13 +369,6 @@ def check_sanity(sanity_data):
print("WARNING: sanity.bbclass can't compare versions without python-distutils")
return 1
- # Check the bitbake version meets minimum requirements
- minversion = sanity_data.getVar('BB_MIN_VERSION', True)
- if not minversion:
- # Hack: BB_MIN_VERSION hasn't been parsed yet so return
- # and wait for the next call
- return
-
if 0 == os.getuid():
raise_sanity_error("Do not use Bitbake as root.", sanity_data)
@@ -392,6 +385,8 @@ def check_sanity(sanity_data):
except ImportError:
messages = messages + 'Your python is not a full install. Please install the module xml.parsers.expat (python-xml on openSUSE and SUSE Linux).\n'
+ # Check the bitbake version meets minimum requirements
+ minversion = sanity_data.getVar('BB_MIN_VERSION', True)
if (LooseVersion(bb.__version__) < LooseVersion(minversion)):
messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, bb.__version__)