summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-12-09 19:56:28 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-14 23:13:06 +0000
commit9de8dfa11a9d0008fd43bd38f81ab3d65b998033 (patch)
tree4f4454e797df52c0f03d884f9ce835c4274e9805 /bitbake
parent535fc9b6fb7e8b7b2e323ad826070f6003c6f229 (diff)
downloadpoky-9de8dfa11a9d0008fd43bd38f81ab3d65b998033.tar.gz
bitbake: toaster: Fix references to app paths
The buildinfohelper runs outside of Django, but still needs access to our Django app classes. Previously, the imports referenced the toaster.* app, which worked fine. But in Django 1.8, this causes an error about the same module being loaded multiple times from different paths. Change the paths to our Django modules so they don't cause this error to be thrown. We can do this as we've added our application libraries to sys.path in the buildinfohelper anyway. [YOCTO #8364] (Bitbake rev: 070da64cf32c32b5ffc34d611b463c3a3960b419) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 1d41bba408..c09955157a 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -33,14 +33,14 @@ def _configure_toaster():
33 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'toaster')) 33 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'toaster'))
34_configure_toaster() 34_configure_toaster()
35 35
36from toaster.orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage, HelpText 36from orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage, HelpText
37from toaster.orm.models import Target_Image_File, BuildArtifact 37from orm.models import Target_Image_File, BuildArtifact
38from toaster.orm.models import Variable, VariableHistory 38from orm.models import Variable, VariableHistory
39from toaster.orm.models import Package, Package_File, Target_Installed_Package, Target_File 39from orm.models import Package, Package_File, Target_Installed_Package, Target_File
40from toaster.orm.models import Task_Dependency, Package_Dependency 40from orm.models import Task_Dependency, Package_Dependency
41from toaster.orm.models import Recipe_Dependency 41from orm.models import Recipe_Dependency
42 42
43from toaster.orm.models import Project 43from orm.models import Project
44from bldcontrol.models import BuildEnvironment, BuildRequest 44from bldcontrol.models import BuildEnvironment, BuildRequest
45 45
46from bb.msg import BBLogFormatter as formatter 46from bb.msg import BBLogFormatter as formatter