diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-07 18:19:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-14 12:53:52 +0100 |
commit | 98abb113a02a4504ae969dbaf9844ab6539dcdb8 (patch) | |
tree | 43a1e93edf8f288305fd7b57a18c5a383dc02271 | |
parent | 2cc601cd266959cb7e9726cc5946dc2a49953b16 (diff) | |
download | poky-98abb113a02a4504ae969dbaf9844ab6539dcdb8.tar.gz |
scripts/buildenv-internal/sanity: Update to python 2.7.3 as a minimum
We're finding bugs in python 2.6 and starting to require unittest
functionality in python 2.7.x. Its time to bump the minimum version
requirement. Anyone without python 2.7.x can use the buildtools-tarball
out to install a standalone python/git/tar setup which will work
with the system.
(From OE-Core rev: 8b90f1becd40a7f857d2fbe30eaffe218a976419)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/sanity.bbclass | 7 | ||||
-rwxr-xr-x | scripts/oe-buildenv-internal | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 0eb6ae334b..e692f33839 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -381,11 +381,10 @@ def check_sanity(sanity_data): | |||
381 | 381 | ||
382 | messages = "" | 382 | messages = "" |
383 | 383 | ||
384 | # Check the Python version, we now use Python 2.6 features in | 384 | # Check the Python version, we now have a minimum of Python 2.7.3 |
385 | # various classes | ||
386 | import sys | 385 | import sys |
387 | if sys.hexversion < 0x020600F0: | 386 | if sys.hexversion < 0x020703F0: |
388 | messages = messages + 'The system requires at least Python 2.6 to run. Please update your Python interpreter.\n' | 387 | messages = messages + 'The system requires at least Python 2.7.3 to run. Please update your Python interpreter.\n' |
389 | # Check the python install is complete. glib-2.0-natives requries | 388 | # Check the python install is complete. glib-2.0-natives requries |
390 | # xml.parsers.expat | 389 | # xml.parsers.expat |
391 | try: | 390 | try: |
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index a33698c5ba..40d95b7871 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal | |||
@@ -43,9 +43,9 @@ fi | |||
43 | # Similarly, we now have code that doesn't parse correctly with older | 43 | # Similarly, we now have code that doesn't parse correctly with older |
44 | # versions of Python, and rather than fixing that and being eternally | 44 | # versions of Python, and rather than fixing that and being eternally |
45 | # vigilant for any other new feature use, just check the version here. | 45 | # vigilant for any other new feature use, just check the version here. |
46 | py_v26_check=`python -c 'import sys; print sys.version_info >= (2,6,0)'` | 46 | py_v26_check=`python -c 'import sys; print sys.version_info >= (2,7,3)'` |
47 | if [ "$py_v26_check" != "True" ]; then | 47 | if [ "$py_v26_check" != "True" ]; then |
48 | echo "BitBake requires Python 2.6 or later" | 48 | echo "BitBake requires Python 2.7.3 or later" |
49 | exit 1 | 49 | exit 1 |
50 | fi | 50 | fi |
51 | 51 | ||