bitbake: toaster: remove SDKMACHINE from project variables
Removed SDKMACHINE from predefined set of variables for the project as it causes bitbake build error: SDKMACHINE is set, but SDK_ARCH has not been changed as a result This variable does not need to be predefined as it's not used by toaster. It's still possible to specify it in project configuration if needed. SDK_ARCH variable should be set too to avoid above mentioned build failure. (Bitbake rev: a6ab2a38ab666376b4a5e796d3a88929e8cbfb22) Signed-off-by: Ed Bartosh <ed.bartosh@linux.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:
parent
4186f5b04e
commit
556b8b6156
|
@ -107,32 +107,6 @@
|
||||||
</form>
|
</form>
|
||||||
</dd>
|
</dd>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if sdk_machine_defined %}
|
|
||||||
<dt>
|
|
||||||
<span class="js-config-var-name js-config-var-managed-name">SDKMACHINE</span>
|
|
||||||
<i class="icon-question-sign get-help" title="Specifies the architecture (i.e. i686 or x86_64) for which to build SDK and ADT items <br /><a href='http://www.yoctoproject.org/docs/1.6.1/ref-manual/ref-manual.html#var-SDKMACHINE' target='_blank'>Read more in the manual</a>"></i>
|
|
||||||
</dt>
|
|
||||||
<dd class="lead">
|
|
||||||
<span id="sdkmachine">{{sdk_machine}}</span>
|
|
||||||
<i id="change-sdkmachine-icon" class="icon-pencil"></i>
|
|
||||||
<form id="change-sdkmachine-form" style="display:none;">
|
|
||||||
<label class="radio">
|
|
||||||
<input type="radio" name="sdkmachine" value="i686">
|
|
||||||
i686
|
|
||||||
</label>
|
|
||||||
<label class="radio">
|
|
||||||
<input type="radio" name="sdkmachine" value="x86_64">
|
|
||||||
x86_64
|
|
||||||
</label>
|
|
||||||
<div style="padding-top:10px;">
|
|
||||||
<button id="apply-change-sdkmachine" type="button" class="btn">Save</button>
|
|
||||||
<button id="cancel-change-sdkmachine" type="button" class="btn btn-link">Cancel</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</dd>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
</dl>
|
</dl>
|
||||||
|
|
||||||
<!-- <ul class="unstyled configuration-list" id="configvar-list"> -->
|
<!-- <ul class="unstyled configuration-list" id="configvar-list"> -->
|
||||||
|
@ -774,48 +748,6 @@
|
||||||
});
|
});
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
{% if sdk_machine_defined %}
|
|
||||||
// change SDKMACHINE variable
|
|
||||||
$('#change-sdkmachine-icon').click(function() {
|
|
||||||
var current_value = document.getElementById("sdkmachine").innerHTML;
|
|
||||||
var radios = document.getElementsByName('sdkmachine');
|
|
||||||
for (var i = 0, length = radios.length; i < length; i++) {
|
|
||||||
radios[i].checked = false;
|
|
||||||
if (radios[i].value == current_value) {
|
|
||||||
radios[i].checked = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$('#change-sdkmachine-icon, #sdkmachine').hide();
|
|
||||||
$("#change-sdkmachine-form").slideDown();
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#cancel-change-sdkmachine').click(function(){
|
|
||||||
$("#change-sdkmachine-form").slideUp(function() {
|
|
||||||
$('#sdkmachine, #change-sdkmachine-icon').show();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#apply-change-sdkmachine').click(function(){
|
|
||||||
var value="";
|
|
||||||
var radios = document.getElementsByName('sdkmachine');
|
|
||||||
for (var i = 0, length = radios.length; i < length; i++) {
|
|
||||||
if (radios[i].checked) {
|
|
||||||
// do whatever you want with the checked radio
|
|
||||||
value=radios[i].value;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
postEditAjaxRequest({"configvarChange" : 'SDKMACHINE:'+value});
|
|
||||||
$('#sdkmachine').text(value);
|
|
||||||
$("#change-sdkmachine-form").slideUp(function() {
|
|
||||||
$('#sdkmachine, #change-sdkmachine-icon').show();
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
|
|
||||||
// add new variable
|
// add new variable
|
||||||
$("button#add-configvar-button").click( function (evt) {
|
$("button#add-configvar-button").click( function (evt) {
|
||||||
var variable = $("input#variable").val();
|
var variable = $("input#variable").val();
|
||||||
|
@ -830,7 +762,7 @@
|
||||||
$(".save").attr("disabled","disabled");
|
$(".save").attr("disabled","disabled");
|
||||||
|
|
||||||
// Reload page if admin-removed core managed value is manually added back in
|
// Reload page if admin-removed core managed value is manually added back in
|
||||||
if (0 <= " DISTRO IMAGE_FSTYPES IMAGE_INSTALL_append PACKAGE_CLASSES SDKMACHINE ".indexOf( " "+variable+" " )) {
|
if (0 <= " DISTRO IMAGE_FSTYPES IMAGE_INSTALL_append PACKAGE_CLASSES ".indexOf( " "+variable+" " )) {
|
||||||
// delayed reload to avoid race condition with postEditAjaxRequest
|
// delayed reload to avoid race condition with postEditAjaxRequest
|
||||||
do_reload=true;
|
do_reload=true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2456,10 +2456,6 @@ 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['sdk_machine'] = ProjectVariable.objects.get(project = prj, name = "SDKMACHINE").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")
|
||||||
|
|
||||||
|
@ -2868,11 +2864,6 @@ if True:
|
||||||
context['package_classes_defined'] = "1"
|
context['package_classes_defined'] = "1"
|
||||||
except ProjectVariable.DoesNotExist:
|
except ProjectVariable.DoesNotExist:
|
||||||
pass
|
pass
|
||||||
try:
|
|
||||||
context['sdk_machine'] = ProjectVariable.objects.get(project = prj, name = "SDKMACHINE").value
|
|
||||||
context['sdk_machine_defined'] = "1"
|
|
||||||
except ProjectVariable.DoesNotExist:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue