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>
This commit is contained in:
Michael Wood 2016-02-08 17:41:24 +00:00 committed by Richard Purdie
parent 5e14a8f2fe
commit 30c132bc47
4 changed files with 0 additions and 10 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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,
}

View File

@ -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