diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-02-08 17:41:24 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-10 13:29:22 +0000 |
commit | 30c132bc4726be90fadee419a588a8b8f2161380 (patch) | |
tree | 307219b90bc3704d8bcb2767f7a169038493b695 /bitbake/lib/toaster | |
parent | 5e14a8f2fe1b9a051d78a629c844362d1214ef5e (diff) | |
download | openembedded-core-contrib-30c132bc4726be90fadee419a588a8b8f2161380.tar.gz |
bitbake: toaster: Enable Image Customisation feature
Remove environment variable to toggle Image customisation feature
(Bitbake rev: 2e9c86229b8f924a5b62987f4b166f63392f12e8)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
4 files changed, 0 insertions, 10 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html index b143b78833..8778305f3f 100644 --- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html +++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html @@ -27,9 +27,7 @@ <ul class="nav nav-list well"> <li><a class="nav-parent" href="{% url 'project' project.id %}">Configuration</a></li> <li class="nav-header">Compatible metadata</li> - {% if CUSTOM_IMAGE %} <li><a href="{% url 'projectcustomimages' project.id %}">Custom images</a></li> - {% endif %} <li><a href="{% url 'projectimagerecipes' project.id %}">Image recipes</a></li> <li><a href="{% url 'projectsoftwarerecipes' project.id %}">Software recipes</a></li> <li><a href="{% url 'projectmachines' project.id %}">Machines</a></li> diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html index c1cd6a83a2..5bc1ac4ad2 100644 --- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html +++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html @@ -59,13 +59,11 @@ Import layer </a> </li> - {% if CUSTOM_IMAGE %} <li> <a href="{% url 'newcustomimage' project.id %}"> New custom image </a> </li> - {% endif %} <li class="pull-right"> <form class="form-inline" style="margin-bottom:0px;"> <i class="icon-question-sign get-help heading-help" data-placement="left" title="" data-original-title="Type the name of one or more recipes you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to the recipe name, like so: <code>busybox:clean</code>"></i> diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 30ec39c24f..dfa256e8ea 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -1845,7 +1845,6 @@ def managedcontextprocessor(request): "projects": projects, "non_cli_projects": projects.exclude(is_default=True), "DEBUG" : toastermain.settings.DEBUG, - "CUSTOM_IMAGE" : toastermain.settings.CUSTOM_IMAGE, "TOASTER_BRANCH": toastermain.settings.TOASTER_BRANCH, "TOASTER_REVISION" : toastermain.settings.TOASTER_REVISION, } diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index c4f3d6bfff..74ab60462b 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py @@ -23,11 +23,6 @@ import os, re -# Temporary toggle for Image customisation -CUSTOM_IMAGE = False -if os.environ.get("CUSTOM_IMAGE", None) is not None: - CUSTOM_IMAGE = True - DEBUG = True TEMPLATE_DEBUG = DEBUG |