summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-02-08 17:41:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-10 13:29:22 +0000
commit30c132bc4726be90fadee419a588a8b8f2161380 (patch)
tree307219b90bc3704d8bcb2767f7a169038493b695 /bitbake/lib
parent5e14a8f2fe1b9a051d78a629c844362d1214ef5e (diff)
downloadpoky-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')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/baseprojectpage.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/projecttopbar.html2
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py1
-rw-r--r--bitbake/lib/toaster/toastermain/settings.py5
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 @@
27 <ul class="nav nav-list well"> 27 <ul class="nav nav-list well">
28 <li><a class="nav-parent" href="{% url 'project' project.id %}">Configuration</a></li> 28 <li><a class="nav-parent" href="{% url 'project' project.id %}">Configuration</a></li>
29 <li class="nav-header">Compatible metadata</li> 29 <li class="nav-header">Compatible metadata</li>
30 {% if CUSTOM_IMAGE %}
31 <li><a href="{% url 'projectcustomimages' project.id %}">Custom images</a></li> 30 <li><a href="{% url 'projectcustomimages' project.id %}">Custom images</a></li>
32 {% endif %}
33 <li><a href="{% url 'projectimagerecipes' project.id %}">Image recipes</a></li> 31 <li><a href="{% url 'projectimagerecipes' project.id %}">Image recipes</a></li>
34 <li><a href="{% url 'projectsoftwarerecipes' project.id %}">Software recipes</a></li> 32 <li><a href="{% url 'projectsoftwarerecipes' project.id %}">Software recipes</a></li>
35 <li><a href="{% url 'projectmachines' project.id %}">Machines</a></li> 33 <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 @@
59 Import layer 59 Import layer
60 </a> 60 </a>
61 </li> 61 </li>
62 {% if CUSTOM_IMAGE %}
63 <li> 62 <li>
64 <a href="{% url 'newcustomimage' project.id %}"> 63 <a href="{% url 'newcustomimage' project.id %}">
65 New custom image 64 New custom image
66 </a> 65 </a>
67 </li> 66 </li>
68 {% endif %}
69 <li class="pull-right"> 67 <li class="pull-right">
70 <form class="form-inline" style="margin-bottom:0px;"> 68 <form class="form-inline" style="margin-bottom:0px;">
71 <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> 69 <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):
1845 "projects": projects, 1845 "projects": projects,
1846 "non_cli_projects": projects.exclude(is_default=True), 1846 "non_cli_projects": projects.exclude(is_default=True),
1847 "DEBUG" : toastermain.settings.DEBUG, 1847 "DEBUG" : toastermain.settings.DEBUG,
1848 "CUSTOM_IMAGE" : toastermain.settings.CUSTOM_IMAGE,
1849 "TOASTER_BRANCH": toastermain.settings.TOASTER_BRANCH, 1848 "TOASTER_BRANCH": toastermain.settings.TOASTER_BRANCH,
1850 "TOASTER_REVISION" : toastermain.settings.TOASTER_REVISION, 1849 "TOASTER_REVISION" : toastermain.settings.TOASTER_REVISION,
1851 } 1850 }
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 @@
23 23
24import os, re 24import os, re
25 25
26# Temporary toggle for Image customisation
27CUSTOM_IMAGE = False
28if os.environ.get("CUSTOM_IMAGE", None) is not None:
29 CUSTOM_IMAGE = True
30
31DEBUG = True 26DEBUG = True
32TEMPLATE_DEBUG = DEBUG 27TEMPLATE_DEBUG = DEBUG
33 28