summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/bldcontrol/bbcontroller.py2
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py2
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py2
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py
index d09ac17875..9bddadbf19 100644
--- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py
@@ -79,7 +79,7 @@ def getBuildEnvironmentController(**kwargs):
79 The return object MUST always be a BuildEnvironmentController. 79 The return object MUST always be a BuildEnvironmentController.
80 """ 80 """
81 81
82 from localhostbecontroller import LocalhostBEController 82 from bldcontrol.localhostbecontroller import LocalhostBEController
83 83
84 be = BuildEnvironment.objects.filter(Q(**kwargs))[0] 84 be = BuildEnvironment.objects.filter(Q(**kwargs))[0]
85 if be.betype == BuildEnvironment.TYPE_LOCAL: 85 if be.betype == BuildEnvironment.TYPE_LOCAL:
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 7b2f126e98..b4e41968f1 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -32,7 +32,7 @@ import subprocess
32 32
33from toastermain import settings 33from toastermain import settings
34 34
35from bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException, BitbakeController 35from bldcontrol.bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException, BitbakeController
36 36
37import logging 37import logging
38logger = logging.getLogger("toaster") 38logger = logging.getLogger("toaster")
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
index 6b1da1b103..2407e1bbcc 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
@@ -105,7 +105,7 @@ class Command(NoArgsCommand):
105 try: 105 try:
106 config_file = os.environ.get('TOASTER_CONF') 106 config_file = os.environ.get('TOASTER_CONF')
107 print("\nImporting file: %s" % config_file) 107 print("\nImporting file: %s" % config_file)
108 from loadconf import Command as LoadConfigCommand 108 from .loadconf import Command as LoadConfigCommand
109 109
110 LoadConfigCommand()._import_layer_config(config_file) 110 LoadConfigCommand()._import_layer_config(config_file)
111 # we run lsupdates after config update 111 # we run lsupdates after config update
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
index 5022b59400..6d25df9e54 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
@@ -4,7 +4,7 @@ from orm.models import BitbakeVersion, Release, ReleaseDefaultLayer, ReleaseLaye
4from django.db import IntegrityError 4from django.db import IntegrityError
5import os 5import os
6 6
7from checksettings import DN 7from .checksettings import DN
8 8
9import logging 9import logging
10logger = logging.getLogger("toaster") 10logger = logging.getLogger("toaster")