summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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):
369 print("WARNING: sanity.bbclass can't compare versions without python-distutils") 369 print("WARNING: sanity.bbclass can't compare versions without python-distutils")
370 return 1 370 return 1
371 371
372 # Check the bitbake version meets minimum requirements
373 minversion = sanity_data.getVar('BB_MIN_VERSION', True)
374 if not minversion:
375 # Hack: BB_MIN_VERSION hasn't been parsed yet so return
376 # and wait for the next call
377 return
378
379 if 0 == os.getuid(): 372 if 0 == os.getuid():
380 raise_sanity_error("Do not use Bitbake as root.", sanity_data) 373 raise_sanity_error("Do not use Bitbake as root.", sanity_data)
381 374
@@ -392,6 +385,8 @@ def check_sanity(sanity_data):
392 except ImportError: 385 except ImportError:
393 messages = messages + 'Your python is not a full install. Please install the module xml.parsers.expat (python-xml on openSUSE and SUSE Linux).\n' 386 messages = messages + 'Your python is not a full install. Please install the module xml.parsers.expat (python-xml on openSUSE and SUSE Linux).\n'
394 387
388 # Check the bitbake version meets minimum requirements
389 minversion = sanity_data.getVar('BB_MIN_VERSION', True)
395 if (LooseVersion(bb.__version__) < LooseVersion(minversion)): 390 if (LooseVersion(bb.__version__) < LooseVersion(minversion)):
396 messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, bb.__version__) 391 messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, bb.__version__)
397 392