summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/bldcontrol
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol')
-rw-r--r--bitbake/lib/toaster/bldcontrol/admin.py1
-rw-r--r--bitbake/lib/toaster/bldcontrol/bbcontroller.py4
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py11
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py4
-rw-r--r--bitbake/lib/toaster/bldcontrol/models.py3
5 files changed, 7 insertions, 16 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/admin.py b/bitbake/lib/toaster/bldcontrol/admin.py
index e85c30ed11..1754bc11cc 100644
--- a/bitbake/lib/toaster/bldcontrol/admin.py
+++ b/bitbake/lib/toaster/bldcontrol/admin.py
@@ -3,7 +3,6 @@
3# 3#
4 4
5from django.contrib import admin 5from django.contrib import admin
6from django.contrib.admin.filters import RelatedFieldListFilter
7from .models import BuildEnvironment 6from .models import BuildEnvironment
8 7
9class BuildEnvironmentAdmin(admin.ModelAdmin): 8class BuildEnvironmentAdmin(admin.ModelAdmin):
diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py
index 301df1880a..71c288df34 100644
--- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py
@@ -8,10 +8,8 @@
8 8
9import os 9import os
10import sys 10import sys
11import re
12from django.db import transaction
13from django.db.models import Q 11from django.db.models import Q
14from bldcontrol.models import BuildEnvironment, BRLayer, BRVariable, BRTarget, BRBitbake 12from bldcontrol.models import BuildEnvironment, BRLayer, BRBitbake
15 13
16# load Bitbake components 14# load Bitbake components
17path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))) 15path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 39ea736b58..75674ccbf1 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -7,27 +7,24 @@
7# 7#
8 8
9import os 9import os
10import sys
11import re 10import re
12import shutil 11import shutil
13import time 12import time
14from django.db import transaction 13from bldcontrol.models import BuildEnvironment, BuildRequest, Build
15from django.db.models import Q 14from orm.models import CustomImageRecipe, Layer, Layer_Version, Project, ToasterSetting
16from bldcontrol.models import BuildEnvironment, BuildRequest, BRLayer, BRVariable, BRTarget, BRBitbake, Build
17from orm.models import CustomImageRecipe, Layer, Layer_Version, Project, ProjectLayer, ToasterSetting
18from orm.models import signal_runbuilds 15from orm.models import signal_runbuilds
19import subprocess 16import subprocess
20 17
21from toastermain import settings 18from toastermain import settings
22 19
23from bldcontrol.bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException, BitbakeController 20from bldcontrol.bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException
24 21
25import logging 22import logging
26logger = logging.getLogger("toaster") 23logger = logging.getLogger("toaster")
27 24
28install_dir = os.environ.get('TOASTER_DIR') 25install_dir = os.environ.get('TOASTER_DIR')
29 26
30from pprint import pprint, pformat 27from pprint import pformat
31 28
32class LocalhostBEController(BuildEnvironmentController): 29class LocalhostBEController(BuildEnvironmentController):
33 """ Implementation of the BuildEnvironmentController for the localhost; 30 """ Implementation of the BuildEnvironmentController for the localhost;
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
index fe2c4dc2bb..cfcd4a00e5 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
@@ -2,11 +2,9 @@
2# SPDX-License-Identifier: GPL-2.0-only 2# SPDX-License-Identifier: GPL-2.0-only
3# 3#
4 4
5from django.core.management.base import BaseCommand, CommandError 5from django.core.management.base import BaseCommand
6from django.db import transaction
7 6
8from django.core.management import call_command 7from django.core.management import call_command
9from bldcontrol.bbcontroller import getBuildEnvironmentController, ShellCmdException
10from bldcontrol.models import BuildRequest, BuildEnvironment, BRError 8from bldcontrol.models import BuildRequest, BuildEnvironment, BRError
11from orm.models import ToasterSetting, Build, Layer 9from orm.models import ToasterSetting, Build, Layer
12 10
diff --git a/bitbake/lib/toaster/bldcontrol/models.py b/bitbake/lib/toaster/bldcontrol/models.py
index bcffcf5e20..0d30fd9be0 100644
--- a/bitbake/lib/toaster/bldcontrol/models.py
+++ b/bitbake/lib/toaster/bldcontrol/models.py
@@ -4,9 +4,8 @@
4 4
5from __future__ import unicode_literals 5from __future__ import unicode_literals
6from django.db import models 6from django.db import models
7from django.core.validators import MaxValueValidator, MinValueValidator
8from django.utils.encoding import force_text 7from django.utils.encoding import force_text
9from orm.models import Project, ProjectLayer, ProjectVariable, ProjectTarget, Build, Layer_Version 8from orm.models import Project, Build, Layer_Version
10 9
11import logging 10import logging
12logger = logging.getLogger("toaster") 11logger = logging.getLogger("toaster")