1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00

bitbake: toaster: update view to support DL_DIR and SSTATE_DIR

Update toaster's views.py to support DL_DIR and SSTATE_DIR for
page projectconf.html. Removed DL_DIR and SSTATE_DIR from
blacklist. Initial value of DL_DIR and SSTATE_DIR comes from
BuildEnvironment.

[YOCTO #8422]

(Bitbake rev: 9f672d7ba503d17175eef37ec03a5779e4c9f792)

Signed-off-by: Sujith H <sujith.h@gmail.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Sujith H
2016-04-06 17:46:43 +01:00
committed by Richard Purdie
parent 4aafcae5e4
commit 705d44fc0d
+38 -2
View File
@@ -45,6 +45,7 @@ from django.utils import formats
from toastergui.templatetags.projecttags import json as jsonfilter from toastergui.templatetags.projecttags import json as jsonfilter
from decimal import Decimal from decimal import Decimal
import json import json
import os
from os.path import dirname from os.path import dirname
from functools import wraps from functools import wraps
import itertools import itertools
@@ -1875,6 +1876,7 @@ def managedcontextprocessor(request):
import toastermain.settings import toastermain.settings
from orm.models import Project, ProjectLayer, ProjectTarget, ProjectVariable from orm.models import Project, ProjectLayer, ProjectTarget, ProjectVariable
from bldcontrol.models import BuildEnvironment
# we have a set of functions if we're in managed mode, or # we have a set of functions if we're in managed mode, or
# a default "page not available" simple functions for interactive mode # a default "page not available" simple functions for interactive mode
@@ -2176,6 +2178,10 @@ if True:
return_data['distro'] = ProjectVariable.objects.get(project = prj, name = "DISTRO").value, return_data['distro'] = ProjectVariable.objects.get(project = prj, name = "DISTRO").value,
except ProjectVariable.DoesNotExist: except ProjectVariable.DoesNotExist:
pass pass
try:
return_data['dl_dir'] = ProjectVariable.objects.get(project = prj, name = "DL_DIR").value,
except ProjectVariable.DoesNotExist:
pass
try: try:
return_data['fstypes'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_FSTYPES").value, return_data['fstypes'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_FSTYPES").value,
except ProjectVariable.DoesNotExist: except ProjectVariable.DoesNotExist:
@@ -2188,6 +2194,10 @@ if True:
return_data['package_classes'] = ProjectVariable.objects.get(project = prj, name = "PACKAGE_CLASSES").value, return_data['package_classes'] = ProjectVariable.objects.get(project = prj, name = "PACKAGE_CLASSES").value,
except ProjectVariable.DoesNotExist: except ProjectVariable.DoesNotExist:
pass pass
try:
return_data['sstate_dir'] = ProjectVariable.objects.get(project = prj, name = "SSTATE_DIR").value,
except ProjectVariable.DoesNotExist:
pass
return HttpResponse(json.dumps( return_data ), content_type = "application/json") return HttpResponse(json.dumps( return_data ), content_type = "application/json")
@@ -2795,9 +2805,9 @@ if True:
} }
vars_blacklist = { vars_blacklist = {
'DL_DR','PARALLEL_MAKE','BB_NUMBER_THREADS','SSTATE_DIR', 'PARALLEL_MAKE','BB_NUMBER_THREADS',
'BB_DISKMON_DIRS','BB_NUMBER_THREADS','CVS_PROXY_HOST','CVS_PROXY_PORT', 'BB_DISKMON_DIRS','BB_NUMBER_THREADS','CVS_PROXY_HOST','CVS_PROXY_PORT',
'DL_DIR','PARALLEL_MAKE','SSTATE_DIR','SSTATE_DIR','SSTATE_MIRRORS','TMPDIR', 'PARALLEL_MAKE','SSTATE_MIRRORS','TMPDIR',
'all_proxy','ftp_proxy','http_proxy ','https_proxy' 'all_proxy','ftp_proxy','http_proxy ','https_proxy'
} }
@@ -2834,6 +2844,19 @@ if True:
context['distro_defined'] = "1" context['distro_defined'] = "1"
except ProjectVariable.DoesNotExist: except ProjectVariable.DoesNotExist:
pass pass
try:
if ProjectVariable.objects.get(project = prj, name = "DL_DIR").value == "${TOPDIR}/../downloads":
be = BuildEnvironment.objects.get(pk = str(1))
dl_dir = os.path.join(dirname(be.builddir), "downloads")
context['dl_dir'] = dl_dir
pv, created = ProjectVariable.objects.get_or_create(project = prj, name = "DL_DIR")
pv.value = dl_dir
pv.save()
else:
context['dl_dir'] = ProjectVariable.objects.get(project = prj, name = "DL_DIR").value
context['dl_dir_defined'] = "1"
except ProjectVariable.DoesNotExist,BuildEnvironment.DoesNotExist:
pass
try: try:
context['fstypes'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_FSTYPES").value context['fstypes'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_FSTYPES").value
context['fstypes_defined'] = "1" context['fstypes_defined'] = "1"
@@ -2849,6 +2872,19 @@ if True:
context['package_classes_defined'] = "1" context['package_classes_defined'] = "1"
except ProjectVariable.DoesNotExist: except ProjectVariable.DoesNotExist:
pass pass
try:
if ProjectVariable.objects.get(project = prj, name = "SSTATE_DIR").value == "${TOPDIR}/../sstate-cache":
be = BuildEnvironment.objects.get(pk = str(1))
sstate_dir = os.path.join(dirname(be.builddir), "sstate-cache")
context['sstate_dir'] = sstate_dir
pv, created = ProjectVariable.objects.get_or_create(project = prj, name = "SSTATE_DIR")
pv.value = sstate_dir
pv.save()
else:
context['sstate_dir'] = ProjectVariable.objects.get(project = prj, name = "SSTATE_DIR").value
context['sstate_dir_defined'] = "1"
except ProjectVariable.DoesNotExist, BuildEnvironment.DoesNotExist:
pass
return context return context