diff options
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol')
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 | ||
5 | from django.contrib import admin | 5 | from django.contrib import admin |
6 | from django.contrib.admin.filters import RelatedFieldListFilter | ||
7 | from .models import BuildEnvironment | 6 | from .models import BuildEnvironment |
8 | 7 | ||
9 | class BuildEnvironmentAdmin(admin.ModelAdmin): | 8 | class 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 | ||
9 | import os | 9 | import os |
10 | import sys | 10 | import sys |
11 | import re | ||
12 | from django.db import transaction | ||
13 | from django.db.models import Q | 11 | from django.db.models import Q |
14 | from bldcontrol.models import BuildEnvironment, BRLayer, BRVariable, BRTarget, BRBitbake | 12 | from bldcontrol.models import BuildEnvironment, BRLayer, BRBitbake |
15 | 13 | ||
16 | # load Bitbake components | 14 | # load Bitbake components |
17 | path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))) | 15 | path = 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 | ||
9 | import os | 9 | import os |
10 | import sys | ||
11 | import re | 10 | import re |
12 | import shutil | 11 | import shutil |
13 | import time | 12 | import time |
14 | from django.db import transaction | 13 | from bldcontrol.models import BuildEnvironment, BuildRequest, Build |
15 | from django.db.models import Q | 14 | from orm.models import CustomImageRecipe, Layer, Layer_Version, Project, ToasterSetting |
16 | from bldcontrol.models import BuildEnvironment, BuildRequest, BRLayer, BRVariable, BRTarget, BRBitbake, Build | ||
17 | from orm.models import CustomImageRecipe, Layer, Layer_Version, Project, ProjectLayer, ToasterSetting | ||
18 | from orm.models import signal_runbuilds | 15 | from orm.models import signal_runbuilds |
19 | import subprocess | 16 | import subprocess |
20 | 17 | ||
21 | from toastermain import settings | 18 | from toastermain import settings |
22 | 19 | ||
23 | from bldcontrol.bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException, BitbakeController | 20 | from bldcontrol.bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException |
24 | 21 | ||
25 | import logging | 22 | import logging |
26 | logger = logging.getLogger("toaster") | 23 | logger = logging.getLogger("toaster") |
27 | 24 | ||
28 | install_dir = os.environ.get('TOASTER_DIR') | 25 | install_dir = os.environ.get('TOASTER_DIR') |
29 | 26 | ||
30 | from pprint import pprint, pformat | 27 | from pprint import pformat |
31 | 28 | ||
32 | class LocalhostBEController(BuildEnvironmentController): | 29 | class 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 | ||
5 | from django.core.management.base import BaseCommand, CommandError | 5 | from django.core.management.base import BaseCommand |
6 | from django.db import transaction | ||
7 | 6 | ||
8 | from django.core.management import call_command | 7 | from django.core.management import call_command |
9 | from bldcontrol.bbcontroller import getBuildEnvironmentController, ShellCmdException | ||
10 | from bldcontrol.models import BuildRequest, BuildEnvironment, BRError | 8 | from bldcontrol.models import BuildRequest, BuildEnvironment, BRError |
11 | from orm.models import ToasterSetting, Build, Layer | 9 | from 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 | ||
5 | from __future__ import unicode_literals | 5 | from __future__ import unicode_literals |
6 | from django.db import models | 6 | from django.db import models |
7 | from django.core.validators import MaxValueValidator, MinValueValidator | ||
8 | from django.utils.encoding import force_text | 7 | from django.utils.encoding import force_text |
9 | from orm.models import Project, ProjectLayer, ProjectVariable, ProjectTarget, Build, Layer_Version | 8 | from orm.models import Project, Build, Layer_Version |
10 | 9 | ||
11 | import logging | 10 | import logging |
12 | logger = logging.getLogger("toaster") | 11 | logger = logging.getLogger("toaster") |