diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-30 20:24:52 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:24:05 +0100 |
| commit | 3a763398272975eee6189209f5b741d7a806376e (patch) | |
| tree | 3a5f0e7d2640272d9df0921924c9de762d23d1ce | |
| parent | 2b362f63428bdd221d82141bb1615ee8950e40b3 (diff) | |
| download | poky-3a763398272975eee6189209f5b741d7a806376e.tar.gz | |
bitbake: toaster: use python3 explicitly
Explicitly used python3 as default python for oe builds
will continue to be python2.
[YOCTO #9584]
(Bitbake rev: fde5c962cb69a11b072d1f238c2371a5137d030d)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | bitbake/bin/toaster | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 05b7935ddb..be1bb9c4f7 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
| @@ -111,7 +111,7 @@ stop_system() | |||
| 111 | 111 | ||
| 112 | verify_prereq() { | 112 | verify_prereq() { |
| 113 | # Verify Django version | 113 | # Verify Django version |
| 114 | reqfile=$(python -c "import os; print(os.path.realpath('$BBBASEDIR/toaster-requirements.txt'))") | 114 | reqfile=$(python3 -c "import os; print(os.path.realpath('$BBBASEDIR/toaster-requirements.txt'))") |
| 115 | exp='s/Django\([><=]\+\)\([^,]\+\),\([><=]\+\)\(.\+\)/' | 115 | exp='s/Django\([><=]\+\)\([^,]\+\),\([><=]\+\)\(.\+\)/' |
| 116 | exp=$exp'import sys,django;version=django.get_version().split(".");' | 116 | exp=$exp'import sys,django;version=django.get_version().split(".");' |
| 117 | exp=$exp'sys.exit(not (version \1 "\2".split(".") and version \3 "\4".split(".")))/p' | 117 | exp=$exp'sys.exit(not (version \1 "\2".split(".") and version \3 "\4".split(".")))/p' |
| @@ -135,7 +135,7 @@ else | |||
| 135 | fi | 135 | fi |
| 136 | 136 | ||
| 137 | export BBBASEDIR=`dirname $TOASTER`/.. | 137 | export BBBASEDIR=`dirname $TOASTER`/.. |
| 138 | MANAGE=$BBBASEDIR/lib/toaster/manage.py | 138 | MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py" |
| 139 | OEROOT=`dirname $TOASTER`/../.. | 139 | OEROOT=`dirname $TOASTER`/../.. |
| 140 | 140 | ||
| 141 | # this is the configuraton file we are using for toaster | 141 | # this is the configuraton file we are using for toaster |
| @@ -162,7 +162,7 @@ fi | |||
| 162 | 162 | ||
| 163 | if [ "$TOASTER_CONF" = "" ]; then | 163 | if [ "$TOASTER_CONF" = "" ]; then |
| 164 | TOASTER_CONF="$TEMPLATECONF/toasterconf.json" | 164 | TOASTER_CONF="$TEMPLATECONF/toasterconf.json" |
| 165 | export TOASTER_CONF=$(python -c "import os; print(os.path.realpath('$TOASTER_CONF'))") | 165 | export TOASTER_CONF=$(python3 -c "import os; print(os.path.realpath('$TOASTER_CONF'))") |
| 166 | fi | 166 | fi |
| 167 | 167 | ||
| 168 | if [ ! -f $TOASTER_CONF ]; then | 168 | if [ ! -f $TOASTER_CONF ]; then |
