[oe-commits] [bitbake] 05/05: toaster: use python3 explicitly
git at git.openembedded.org
git at git.openembedded.org
Wed Jun 1 07:54:02 UTC 2016
rpurdie pushed a commit to branch python3
in repository bitbake.
commit d6925feea8c1be808aeb7ec54baab208cf3ea98d
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Mon May 30 20:24:52 2016 +0300
toaster: use python3 explicitly
Explicitly used python3 as default python for oe builds
will continue to be python2.
[YOCTO #9584]
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
bin/toaster | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/toaster b/bin/toaster
index 05b7935..be1bb9c 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -111,7 +111,7 @@ stop_system()
verify_prereq() {
# Verify Django version
- reqfile=$(python -c "import os; print(os.path.realpath('$BBBASEDIR/toaster-requirements.txt'))")
+ reqfile=$(python3 -c "import os; print(os.path.realpath('$BBBASEDIR/toaster-requirements.txt'))")
exp='s/Django\([><=]\+\)\([^,]\+\),\([><=]\+\)\(.\+\)/'
exp=$exp'import sys,django;version=django.get_version().split(".");'
exp=$exp'sys.exit(not (version \1 "\2".split(".") and version \3 "\4".split(".")))/p'
@@ -135,7 +135,7 @@ else
fi
export BBBASEDIR=`dirname $TOASTER`/..
-MANAGE=$BBBASEDIR/lib/toaster/manage.py
+MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py"
OEROOT=`dirname $TOASTER`/../..
# this is the configuraton file we are using for toaster
@@ -162,7 +162,7 @@ fi
if [ "$TOASTER_CONF" = "" ]; then
TOASTER_CONF="$TEMPLATECONF/toasterconf.json"
- export TOASTER_CONF=$(python -c "import os; print(os.path.realpath('$TOASTER_CONF'))")
+ export TOASTER_CONF=$(python3 -c "import os; print(os.path.realpath('$TOASTER_CONF'))")
fi
if [ ! -f $TOASTER_CONF ]; then
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list