From a355f13f73cb5a3fbd61435a8ee06967c3c86498 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jun 2013 17:44:08 +0100 Subject: sanity.bbclass: Drop horrible obsolete minversion hack We once needed to do this, things seem to work fine without this now, thankfully. (From OE-Core rev: ac090ace11d654dafd642fd93c94091a164476fa) Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'meta/classes/sanity.bbclass') 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__) -- cgit v1.2.3-54-g00ecf