bartosh

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a0d7d59..7e84a7c 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1391,10 +1391,28 @@ class BBCooker:
         build.reset_cache()
         self.buildSetVars()

+        # If we are told to do the None task then query the default task
+        if (task == None):

bartosh

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a0d7d59..416f63f 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -531,6 +531,11 @@ class BBCooker:
         for o in options:
             if o in ['prefile', 'postfile']:
                 clean = False
+                server_val = getattr(self.configuration, "%s_server" % o)
+                if not options[o] and server_val:

bartosh

Traceback (most recent call last):
  File "/home/ed/git/yocto/poky/bitbake/bin/bitbake", line 45, in <module>
    cookerdata.CookerConfiguration()))
  File "/home/ed/git/yocto/poky/bitbake/lib/bb/main.py", line 426, in bitbake_main
    return ui_module.main(server_connection.connection, server_connection.events, configParams)
  File "/home/ed/git/yocto/poky/bitbake/lib/bb/ui/toasterui.py", line 336, in main
    logger.error("Error data dump %s\n%s\n" , traceback.format_tb(curr,1), pformat(curr.tb_frame.f_locals))
  File "/usr/lib64/python2.7/pprint.py", line 63, in pformat
    return PrettyPrinter(indent=indent, width=width, depth=depth).pformat(object)
  File "/usr/lib64/python2.7/pprint.py", line 122, in pformat

bartosh

ERROR: Error data dump ['  File "/home/ed/git/yocto/poky/bitbake/lib/bb/ui/buildinfohelper.py", line 1315, in _save_a_task\n    task_obj = self.orm_wrapper.get_update_task_object(task_info)\n']
{'e': <bb.event.DepTreeGenerated object at 0x7fae64e69890>,
 'event': <bb.event.DepTreeGenerated object at 0x7fae64e69890>,
 'pn': 'binutils-native',
 'recipe': <Recipe: Recipe binutils-native:2.25.1-r0>,
 'self': <bb.ui.buildinfohelper.BuildInfoHelper object at 0x7fae64eb4850>,
 'spec': ['binutils-native', 'do_populate_sysroot'],
 'task_info': {'build': <Build: 10 Test (Release master (master), BBV master (Branch: master)) zlib>,
               'outcome': -1,
               'recipe': <Recipe: Recipe binutils-native:2.25.1-r0>,

bartosh

ERROR: get() returned more than one Recipe -- it returned 2!
Traceback (most recent call last):
  File "/home/ed/git/yocto/poky/bitbake/lib/bb/ui/toasterui.py", line 280, in main
    buildinfohelper.store_tasks_stats(event)
  File "/home/ed/git/yocto/poky/bitbake/lib/bb/ui/buildinfohelper.py", line 1074, in store_tasks_stats
    name = recipename)
  File "/usr/lib/python2.7/site-packages/django/db/models/manager.py", line 151, in get
    return self.get_queryset().get(*args, **kwargs)
  File "/usr/lib/python2.7/site-packages/django/db/models/query.py", line 313, in get
    (self.model._meta.object_name, num))

bartosh

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index abbace8..fbdc329 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -55,7 +55,7 @@ do_configure() {
        KVMOPTS="${KVMENABLE}"
     fi
 
-    ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --libexecdir=${libexecdir} --localstatedir=${localstatedir} --disable-strip ${EXTRA_OECONF} $KVMOPTS
+    CFLAGS="" LDFLAGS="" ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --libexecdir=${libexecdir} --localstatedir=${localstatedir} --disable-strip ${EXTRA_OECONF} $KVMOPTS

bartosh

diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 3832905..d4d5a60 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -1006,6 +1006,8 @@ class LayerIndexLayerSource(LayerSource):
         if not connection.features.autocommits_when_autocommit_is_off:
             transaction.set_autocommit(False)
         for ri in recipes_info:
+            if ri['pn'] == 'zlib':
+                1/0

bartosh

--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -20,13 +20,14 @@ import sys
 import bb
 import re
 import os
+import time

 os.environ["DJANGO_SETTINGS_MODULE"] = "toaster.toastermain.settings"

bartosh

Running migrations:
  Applying orm.0001_initial...Traceback (most recent call last):
  File "../bitbake/bin/../lib/toaster/manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/home/ed/.virtualenvs/toaster/lib/python2.7/site-packages/Django-1.8.dev20151201123522-py2.7.egg/django/core/management/__init__.py", line 427, in execute_from_command_line
    utility.execute()
  File "/home/ed/.virtualenvs/toaster/lib/python2.7/site-packages/Django-1.8.dev20151201123522-py2.7.egg/django/core/management/__init__.py", line 419, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/home/ed/.virtualenvs/toaster/lib/python2.7/site-packages/Django-1.8.dev20151201123522-py2.7.egg/django/core/management/base.py", line 288, in run_from_argv
    self.execute(*args, **options.__dict__)

bartosh

diff --git a/django/db/models/query.py b/django/db/models/query.py
index d76057e..584a152 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -345,7 +345,8 @@ class QuerySet(object):
         """
         obj = self.model(**kwargs)
         self._for_write = True
-        obj.save(force_insert=True, using=self.db)
+        with transaction.atomic(using=self.db):