[gnome-continuous-yocto/gnomeostree-3.28-rocko: 648/8267] bitbake: toaster: use python3 explicitly
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 648/8267] bitbake: toaster: use python3 explicitly
- Date: Sat, 16 Dec 2017 20:43:17 +0000 (UTC)
commit 3a763398272975eee6189209f5b741d7a806376e
Author: Ed Bartosh <ed bartosh linux intel com>
Date: Mon May 30 20:24:52 2016 +0300
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>
bitbake/bin/toaster | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 05b7935..be1bb9c 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]