summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2014-06-06 15:03:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-11 10:35:47 +0100
commit9c3b53f12e4f463cacdcde94103525a129029924 (patch)
tree79bf4ba9a60ae345ee924dd423eef65a67622a29 /bitbake
parente0a3495d44ddeee674768f50a1acf0d2164222eb (diff)
downloadpoky-9c3b53f12e4f463cacdcde94103525a129029924.tar.gz
bitbake: toaster: comment out bldcontrol migration command
This fixes toaster startup failing after the preparatory patches for bldcontrol application have been merged. I slipped a bldcontrol-specific line into the toaster startup script and this prevents toaster from starting. We comment out this line until the bldcontrol application have been merged. (Bitbake rev: d095eec6fc958d0aeb514cdc206734617fd7c930) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/toaster2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 80bda6d67c..f469e4fac6 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -63,7 +63,7 @@ function webserverStartAll()
63 retval=0 63 retval=0
64 python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=1 64 python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=1
65 fi 65 fi
66 python $BBBASEDIR/lib/toaster/manage.py migrate bldcontrol || retval=1 66 # python $BBBASEDIR/lib/toaster/manage.py migrate bldcontrol || retval=1
67 67
68 if [ $retval -eq 0 ]; then 68 if [ $retval -eq 0 ]; then
69 python $BBBASEDIR/lib/toaster/manage.py runserver 0.0.0.0:8000 </dev/null >${BUILDDIR}/toaster_web.log 2>&1 & echo $! >${BUILDDIR}/.toastermain.pid 69 python $BBBASEDIR/lib/toaster/manage.py runserver 0.0.0.0:8000 </dev/null >${BUILDDIR}/toaster_web.log 2>&1 & echo $! >${BUILDDIR}/.toastermain.pid