[PATCH 0/2] toaster: allow builddir to be named other than build bug 9992

[PATCH 0/2] toaster: allow builddir to be named other than build bug 9992

[brian avery]

This pattchset fixes two bugs. The most important of which is in the sublject line.

9992 -> if we do oe-init-build-env cow, toaster would fail because it had the directory
name build hardcoded for toaster.sqlite.  This patch moves the toaster.sqlite database to
TOASTER_DIR so that you can name your builddir whatever you'd like to.

11006-> the runbuilds process was printing out alot of debug and status messages to the
console.  Since the console can also be used to run cli builds while toaster displays
their status, this was quite disconcerting.  This patch redirects the output to
toaster_runbuilds.log.

-brian avery


The following changes since commit ec3d83f9a90288403b96be25da855fa280aadd8d:

  xmlto: Don't hardcode the path to tail (2017-01-31 23:47:33 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib bavery/toaster/9992-builddir-not-buildV4
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bavery/toaster/9992-builddir-not-buildV4

brian avery (2):
  toaster: put runbuilds output into a log file
  toaster: move sqlite database to TOASTER_DIR

 bitbake/bin/toaster                         | 5 ++++-
 bitbake/lib/toaster/toastermain/settings.py | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

--
1.9.1

[PATCH 1/2] toaster: put runbuilds output into a log file

[brian avery]

The output from runbuilds should not spout over the
console where you would be running cmdline builds.
Redirected to TOASTER_DIR/toaster_runbuilds.log.

[YOCTO #11006]

Signed-off-by: brian avery <brian.avery@intel.com>
---
 bitbake/bin/toaster | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index daaf8ea..37a1116 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -255,7 +255,10 @@ case $CMD in
             return 4
         fi
         export BITBAKE_UI='toasterui'
-        $MANAGE runbuilds &
+        $MANAGE runbuilds \
+           </dev/null >>${BUILDDIR}/toaster_runbuilds.log 2>&1 \
+           & echo $! >${BUILDDIR}/.runbuilds.pid
+
         # set fail safe stop system on terminal exit
         trap stop_system SIGHUP
         echo "Successful ${CMD}."
-- 
1.9.1

[PATCH 2/2] toaster: move sqlite database to TOASTER_DIR

[brian avery]

The toaster.sqlite database was located in TOASTER_DIR/build.  This
meant that if you named your build directory something else (like cow),
Toaster would fail to make/find the database.  TOASTER_DIR is on the
whitelist unlike BUILDDIR and we need to be able to write there anyway
given our current layout so this should not disrupt anything.

[YOCTO #9992]

Signed-off-by: brian avery <brian.avery@intel.com>
---
 bitbake/lib/toaster/toastermain/settings.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index aec9dbb..1fd649c 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -38,8 +38,7 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-TOASTER_SQLITE_DEFAULT_DIR = os.path.join(os.environ.get('TOASTER_DIR', ''),
-                                          'build')
+TOASTER_SQLITE_DEFAULT_DIR = os.environ.get('TOASTER_DIR')
 
 DATABASES = {
     'default': {
-- 
1.9.1