bitbake: bitbake: Check if bitbake versions match

Bitbake program and core versions must match.

Moved __version__ from main.py back to bin/bitbake.
Implemented check for version match in bin/bitbake.

(Bitbake rev: 2fe7d8c574ddf6a30278cff1a5a5c4089dc56d6d)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
tbs

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 3e1ca6286c618570ad39efe8b2659bf16844efe0..88ac8c34ca327a485348da5da3f6ce5dca440c68 100755 (executable)
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -35,7 +35,11 @@ except RuntimeError as exc:
 from bb import cookerdata
 from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException
 
+__version__ = "1.27.0"
+
 if __name__ == "__main__":
+    if __version__ != bb.__version__:
+        sys.exit("Bitbake core version and program version mismatch!")
     try:
         ret = bitbake_main(BitBakeConfigParameters(sys.argv),
                            cookerdata.CookerConfiguration())

diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index 2019d5014b6539b60d77fa6e392a6b1662117352..49dc8d5b59dc395518ebda01017c377a4e180fd5 100755 (executable)
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -36,7 +36,6 @@ from bb import ui
 from bb import server
 from bb import cookerdata
 
-__version__ = "1.27.0"
 logger = logging.getLogger("BitBake")
 
 class BBMainException(Exception):
@@ -83,7 +82,7 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters):
 
     def parseCommandLine(self, argv=sys.argv):
         parser = optparse.OptionParser(
-            version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__),
+            version = "BitBake Build Tool Core version %s" % bb.__version__,
             usage = """%prog [options] [recipename/target ...]
 
     Executes the specified task (default is 'build') for a given set of target recipes (.bb files).