diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bitbake | 20 | ||||
| -rwxr-xr-x | scripts/oe-buildenv-internal | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/scripts/bitbake b/scripts/bitbake index a8c67bb125..dde61c405b 100755 --- a/scripts/bitbake +++ b/scripts/bitbake | |||
| @@ -27,26 +27,6 @@ done | |||
| 27 | [ $needpseudo = "0" ] && break | 27 | [ $needpseudo = "0" ] && break |
| 28 | done | 28 | done |
| 29 | 29 | ||
| 30 | # Make sure we're not using python v3.x. This check can't go into | ||
| 31 | # sanity.bbclass because bitbake's source code doesn't even pass | ||
| 32 | # parsing stage when used with python v3, so we catch it here so we | ||
| 33 | # can offer a meaningful error message. | ||
| 34 | py_v3_check=`/usr/bin/env python --version 2>&1 | grep "Python 3"` | ||
| 35 | if [ "$py_v3_check" != "" ]; then | ||
| 36 | echo "Bitbake is not compatible with python v3" | ||
| 37 | echo "Please set up python v2 as your default python interpreter" | ||
| 38 | exit 1 | ||
| 39 | fi | ||
| 40 | |||
| 41 | # Similarly, we now have code that doesn't parse correctly with older | ||
| 42 | # versions of Python, and rather than fixing that and being eternally | ||
| 43 | # vigilant for any other new feature use, just check the version here. | ||
| 44 | py_v26_check=`python -c 'import sys; print sys.version_info >= (2,6,0)'` | ||
| 45 | if [ "$py_v26_check" != "True" ]; then | ||
| 46 | echo "BitBake requires Python 2.6 or later" | ||
| 47 | exit 1 | ||
| 48 | fi | ||
| 49 | |||
| 50 | if [ ! -e conf/bblayers.conf ] ; then | 30 | if [ ! -e conf/bblayers.conf ] ; then |
| 51 | BDPRINT="" | 31 | BDPRINT="" |
| 52 | [ -n "$BUILDDIR" ] && BDPRINT=": $BUILDDIR" | 32 | [ -n "$BUILDDIR" ] && BDPRINT=": $BUILDDIR" |
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 644df8f30c..a33698c5ba 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal | |||
| @@ -29,6 +29,26 @@ if [ ! -z "$OECORE_SDK_VERSION" ]; then | |||
| 29 | return 1 | 29 | return 1 |
| 30 | fi | 30 | fi |
| 31 | 31 | ||
| 32 | # Make sure we're not using python v3.x. This check can't go into | ||
| 33 | # sanity.bbclass because bitbake's source code doesn't even pass | ||
| 34 | # parsing stage when used with python v3, so we catch it here so we | ||
| 35 | # can offer a meaningful error message. | ||
| 36 | py_v3_check=`/usr/bin/env python --version 2>&1 | grep "Python 3"` | ||
| 37 | if [ "$py_v3_check" != "" ]; then | ||
| 38 | echo "Bitbake is not compatible with python v3" | ||
| 39 | echo "Please set up python v2 as your default python interpreter" | ||
| 40 | exit 1 | ||
| 41 | fi | ||
| 42 | |||
| 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 | ||
| 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)'` | ||
| 47 | if [ "$py_v26_check" != "True" ]; then | ||
| 48 | echo "BitBake requires Python 2.6 or later" | ||
| 49 | exit 1 | ||
| 50 | fi | ||
| 51 | |||
| 32 | if [ "x$BDIR" = "x" ]; then | 52 | if [ "x$BDIR" = "x" ]; then |
| 33 | if [ "x$1" = "x" ]; then | 53 | if [ "x$1" = "x" ]; then |
| 34 | BDIR="build" | 54 | BDIR="build" |
