diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/projectconf.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projectconf.html | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/projectconf.html b/bitbake/lib/toaster/toastergui/templates/projectconf.html index bd49f1f585..c306835832 100644 --- a/bitbake/lib/toaster/toastergui/templates/projectconf.html +++ b/bitbake/lib/toaster/toastergui/templates/projectconf.html | |||
@@ -73,7 +73,7 @@ | |||
73 | 73 | ||
74 | {% if image_install_append_defined %} | 74 | {% if image_install_append_defined %} |
75 | <dt> | 75 | <dt> |
76 | <span class="js-config-var-name js-config-var-managed-name">IMAGE_INSTALL_append</span> | 76 | <span class="js-config-var-name js-config-var-managed-name">IMAGE_INSTALL:append</span> |
77 | <span class="glyphicon glyphicon-question-sign get-help" title="Specifies additional packages to install into an image. If your build creates more than one image, the packages will be installed in all of them"></span> | 77 | <span class="glyphicon glyphicon-question-sign get-help" title="Specifies additional packages to install into an image. If your build creates more than one image, the packages will be installed in all of them"></span> |
78 | </dt> | 78 | </dt> |
79 | <dd class="variable-list"> | 79 | <dd class="variable-list"> |
@@ -83,7 +83,7 @@ | |||
83 | <form id="change-image_install-form" class="form-inline" style="display:none;"> | 83 | <form id="change-image_install-form" class="form-inline" style="display:none;"> |
84 | <div class="row"> | 84 | <div class="row"> |
85 | <div class="col-md-4"> | 85 | <div class="col-md-4"> |
86 | <span class="help-block">To set IMAGE_INSTALL_append to more than one package, type the package names separated by a space.</span> | 86 | <span class="help-block">To set IMAGE_INSTALL:append to more than one package, type the package names separated by a space.</span> |
87 | </div> | 87 | </div> |
88 | </div> | 88 | </div> |
89 | <div class="form-group"> | 89 | <div class="form-group"> |
@@ -167,8 +167,8 @@ | |||
167 | {% for fstype in vars_fstypes %} | 167 | {% for fstype in vars_fstypes %} |
168 | <input type="hidden" class="js-checkbox-fstypes-list" value="{{fstype}}"> | 168 | <input type="hidden" class="js-checkbox-fstypes-list" value="{{fstype}}"> |
169 | {% endfor %} | 169 | {% endfor %} |
170 | {% for b in vars_blacklist %} | 170 | {% for b in vars_disallowed %} |
171 | <input type="hidden" class="js-config-blacklist-name" value="{{b}}"> | 171 | <input type="hidden" class="js-config-disallowed-name" value="{{b}}"> |
172 | {% endfor %} | 172 | {% endfor %} |
173 | {% for b in vars_managed %} | 173 | {% for b in vars_managed %} |
174 | <input type="hidden" class="js-config-managed-name" value="{{b}}"> | 174 | <input type="hidden" class="js-config-managed-name" value="{{b}}"> |
@@ -201,12 +201,12 @@ | |||
201 | <p>Toaster cannot set any variables that impact 1) the configuration of the build servers, | 201 | <p>Toaster cannot set any variables that impact 1) the configuration of the build servers, |
202 | or 2) where artifacts produced by the build are stored. Such variables include: </p> | 202 | or 2) where artifacts produced by the build are stored. Such variables include: </p> |
203 | <p> | 203 | <p> |
204 | <code><a href="https://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-BB_DISKMON_DIRS" target="_blank">BB_DISKMON_DIRS</a></code> | 204 | <code><a href="http://docs.yoctoproject.org/ref-manual/variables.html#term-BB_DISKMON_DIRS" target="_blank">BB_DISKMON_DIRS</a></code> |
205 | <code><a href="https://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-BB_NUMBER_THREADS" target="_blank">BB_NUMBER_THREADS</a></code> | 205 | <code><a href="http://docs.yoctoproject.org/ref-manual/variables.html#term-BB_NUMBER_THREADS" target="_blank">BB_NUMBER_THREADS</a></code> |
206 | <code>CVS_PROXY_HOST</code> | 206 | <code>CVS_PROXY_HOST</code> |
207 | <code>CVS_PROXY_PORT</code> | 207 | <code>CVS_PROXY_PORT</code> |
208 | <code><a href="https://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-PARALLEL_MAKE" target="_blank">PARALLEL_MAKE</a></code> | 208 | <code><a href="http://docs.yoctoproject.org/ref-manual/variables.html#term-PARALLEL_MAKE" target="_blank">PARALLEL_MAKE</a></code> |
209 | <code><a href="https://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-TMPDIR" target="_blank">TMPDIR</a></code></p> | 209 | <code><a href="http://docs.yoctoproject.org/ref-manual/variables.html#term-TMPDIR" target="_blank">TMPDIR</a></code></p> |
210 | <p>Plus the following standard shell environment variables:</p> | 210 | <p>Plus the following standard shell environment variables:</p> |
211 | <p><code>http_proxy</code> <code>ftp_proxy</code> <code>https_proxy</code> <code>all_proxy</code></p> | 211 | <p><code>http_proxy</code> <code>ftp_proxy</code> <code>https_proxy</code> <code>all_proxy</code></p> |
212 | </div> | 212 | </div> |
@@ -238,9 +238,9 @@ function validate_new_variable() { | |||
238 | } | 238 | } |
239 | } | 239 | } |
240 | 240 | ||
241 | var blacklist_configvars = document.getElementsByClassName('js-config-blacklist-name'); | 241 | var disallowed_configvars = document.getElementsByClassName('js-config-disallowed-name'); |
242 | for (var i = 0, length = blacklist_configvars.length; i < length; i++) { | 242 | for (var i = 0, length = disallowed_configvars.length; i < length; i++) { |
243 | if (blacklist_configvars[i].value.toUpperCase() == variable.toUpperCase()) { | 243 | if (disallowed_configvars[i].value.toUpperCase() == variable.toUpperCase()) { |
244 | error_msg = "You cannot edit this variable in Toaster because it is set by the build servers"; | 244 | error_msg = "You cannot edit this variable in Toaster because it is set by the build servers"; |
245 | } | 245 | } |
246 | } | 246 | } |
@@ -771,10 +771,10 @@ $(document).ready(function() { | |||
771 | 771 | ||
772 | {% if image_install_append_defined %} | 772 | {% if image_install_append_defined %} |
773 | 773 | ||
774 | // init IMAGE_INSTALL_append trash icon | 774 | // init IMAGE_INSTALL:append trash icon |
775 | setDeleteTooltip($('#delete-image_install-icon')); | 775 | setDeleteTooltip($('#delete-image_install-icon')); |
776 | 776 | ||
777 | // change IMAGE_INSTALL_append variable | 777 | // change IMAGE_INSTALL:append variable |
778 | $('#change-image_install-icon').click(function() { | 778 | $('#change-image_install-icon').click(function() { |
779 | // preset the edit value | 779 | // preset the edit value |
780 | var current_val = $("span#image_install").text().trim(); | 780 | var current_val = $("span#image_install").text().trim(); |
@@ -814,7 +814,7 @@ $(document).ready(function() { | |||
814 | $('#apply-change-image_install').click(function(){ | 814 | $('#apply-change-image_install').click(function(){ |
815 | // insure these non-empty values have single space prefix | 815 | // insure these non-empty values have single space prefix |
816 | var value = " " + $('#new-image_install').val().trim(); | 816 | var value = " " + $('#new-image_install').val().trim(); |
817 | postEditAjaxRequest({"configvarChange" : 'IMAGE_INSTALL_append:'+value}); | 817 | postEditAjaxRequest({"configvarChange" : 'IMAGE_INSTALL:append:'+value}); |
818 | $('#image_install').text(value); | 818 | $('#image_install').text(value); |
819 | $('#image_install').removeClass('text-muted'); | 819 | $('#image_install').removeClass('text-muted'); |
820 | $("#change-image_install-form").slideUp(function () { | 820 | $("#change-image_install-form").slideUp(function () { |
@@ -826,10 +826,10 @@ $(document).ready(function() { | |||
826 | }); | 826 | }); |
827 | }); | 827 | }); |
828 | 828 | ||
829 | // delete IMAGE_INSTALL_append variable value | 829 | // delete IMAGE_INSTALL:append variable value |
830 | $('#delete-image_install-icon').click(function(){ | 830 | $('#delete-image_install-icon').click(function(){ |
831 | $(this).tooltip('hide'); | 831 | $(this).tooltip('hide'); |
832 | postEditAjaxRequest({"configvarChange" : 'IMAGE_INSTALL_append:'+''}); | 832 | postEditAjaxRequest({"configvarChange" : 'IMAGE_INSTALL:append:'+''}); |
833 | $('#image_install').parent().fadeOut(1000, function(){ | 833 | $('#image_install').parent().fadeOut(1000, function(){ |
834 | $('#image_install').addClass('text-muted'); | 834 | $('#image_install').addClass('text-muted'); |
835 | $('#image_install').text('Not set'); | 835 | $('#image_install').text('Not set'); |
@@ -1011,7 +1011,7 @@ $(document).ready(function() { | |||
1011 | $(".save").attr("disabled","disabled"); | 1011 | $(".save").attr("disabled","disabled"); |
1012 | 1012 | ||
1013 | // Reload page if admin-removed core managed value is manually added back in | 1013 | // Reload page if admin-removed core managed value is manually added back in |
1014 | if (0 <= " DISTRO DL_DIR IMAGE_FSTYPES IMAGE_INSTALL_append PACKAGE_CLASSES SSTATE_DIR ".indexOf( " "+variable+" " )) { | 1014 | if (0 <= " DISTRO DL_DIR IMAGE_FSTYPES IMAGE_INSTALL:append PACKAGE_CLASSES SSTATE_DIR ".indexOf( " "+variable+" " )) { |
1015 | // delayed reload to avoid race condition with postEditAjaxRequest | 1015 | // delayed reload to avoid race condition with postEditAjaxRequest |
1016 | do_reload=true; | 1016 | do_reload=true; |
1017 | } | 1017 | } |