diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projectconf.html | 70 | ||||
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 9 |
2 files changed, 1 insertions, 78 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/projectconf.html b/bitbake/lib/toaster/toastergui/templates/projectconf.html index 30fd03e32e..08223daa5b 100644 --- a/bitbake/lib/toaster/toastergui/templates/projectconf.html +++ b/bitbake/lib/toaster/toastergui/templates/projectconf.html | |||
@@ -107,32 +107,6 @@ | |||
107 | </form> | 107 | </form> |
108 | </dd> | 108 | </dd> |
109 | {% endif %} | 109 | {% endif %} |
110 | |||
111 | {% if sdk_machine_defined %} | ||
112 | <dt> | ||
113 | <span class="js-config-var-name js-config-var-managed-name">SDKMACHINE</span> | ||
114 | <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> | ||
115 | </dt> | ||
116 | <dd class="lead"> | ||
117 | <span id="sdkmachine">{{sdk_machine}}</span> | ||
118 | <i id="change-sdkmachine-icon" class="icon-pencil"></i> | ||
119 | <form id="change-sdkmachine-form" style="display:none;"> | ||
120 | <label class="radio"> | ||
121 | <input type="radio" name="sdkmachine" value="i686"> | ||
122 | i686 | ||
123 | </label> | ||
124 | <label class="radio"> | ||
125 | <input type="radio" name="sdkmachine" value="x86_64"> | ||
126 | x86_64 | ||
127 | </label> | ||
128 | <div style="padding-top:10px;"> | ||
129 | <button id="apply-change-sdkmachine" type="button" class="btn">Save</button> | ||
130 | <button id="cancel-change-sdkmachine" type="button" class="btn btn-link">Cancel</button> | ||
131 | </div> | ||
132 | </form> | ||
133 | </dd> | ||
134 | {% endif %} | ||
135 | |||
136 | </dl> | 110 | </dl> |
137 | 111 | ||
138 | <!-- <ul class="unstyled configuration-list" id="configvar-list"> --> | 112 | <!-- <ul class="unstyled configuration-list" id="configvar-list"> --> |
@@ -774,48 +748,6 @@ | |||
774 | }); | 748 | }); |
775 | {% endif %} | 749 | {% endif %} |
776 | 750 | ||
777 | |||
778 | {% if sdk_machine_defined %} | ||
779 | // change SDKMACHINE variable | ||
780 | $('#change-sdkmachine-icon').click(function() { | ||
781 | var current_value = document.getElementById("sdkmachine").innerHTML; | ||
782 | var radios = document.getElementsByName('sdkmachine'); | ||
783 | for (var i = 0, length = radios.length; i < length; i++) { | ||
784 | radios[i].checked = false; | ||
785 | if (radios[i].value == current_value) { | ||
786 | radios[i].checked = true; | ||
787 | } | ||
788 | } | ||
789 | $('#change-sdkmachine-icon, #sdkmachine').hide(); | ||
790 | $("#change-sdkmachine-form").slideDown(); | ||
791 | }); | ||
792 | |||
793 | $('#cancel-change-sdkmachine').click(function(){ | ||
794 | $("#change-sdkmachine-form").slideUp(function() { | ||
795 | $('#sdkmachine, #change-sdkmachine-icon').show(); | ||
796 | }); | ||
797 | }); | ||
798 | |||
799 | $('#apply-change-sdkmachine').click(function(){ | ||
800 | var value=""; | ||
801 | var radios = document.getElementsByName('sdkmachine'); | ||
802 | for (var i = 0, length = radios.length; i < length; i++) { | ||
803 | if (radios[i].checked) { | ||
804 | // do whatever you want with the checked radio | ||
805 | value=radios[i].value; | ||
806 | break; | ||
807 | } | ||
808 | } | ||
809 | postEditAjaxRequest({"configvarChange" : 'SDKMACHINE:'+value}); | ||
810 | $('#sdkmachine').text(value); | ||
811 | $("#change-sdkmachine-form").slideUp(function() { | ||
812 | $('#sdkmachine, #change-sdkmachine-icon').show(); | ||
813 | }); | ||
814 | |||
815 | }); | ||
816 | {% endif %} | ||
817 | |||
818 | |||
819 | // add new variable | 751 | // add new variable |
820 | $("button#add-configvar-button").click( function (evt) { | 752 | $("button#add-configvar-button").click( function (evt) { |
821 | var variable = $("input#variable").val(); | 753 | var variable = $("input#variable").val(); |
@@ -830,7 +762,7 @@ | |||
830 | $(".save").attr("disabled","disabled"); | 762 | $(".save").attr("disabled","disabled"); |
831 | 763 | ||
832 | // Reload page if admin-removed core managed value is manually added back in | 764 | // Reload page if admin-removed core managed value is manually added back in |
833 | if (0 <= " DISTRO IMAGE_FSTYPES IMAGE_INSTALL_append PACKAGE_CLASSES SDKMACHINE ".indexOf( " "+variable+" " )) { | 765 | if (0 <= " DISTRO IMAGE_FSTYPES IMAGE_INSTALL_append PACKAGE_CLASSES ".indexOf( " "+variable+" " )) { |
834 | // delayed reload to avoid race condition with postEditAjaxRequest | 766 | // delayed reload to avoid race condition with postEditAjaxRequest |
835 | do_reload=true; | 767 | do_reload=true; |
836 | } | 768 | } |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 69f5af0f3a..243bb09d62 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -2456,10 +2456,6 @@ if True: | |||
2456 | return_data['package_classes'] = ProjectVariable.objects.get(project = prj, name = "PACKAGE_CLASSES").value, | 2456 | return_data['package_classes'] = ProjectVariable.objects.get(project = prj, name = "PACKAGE_CLASSES").value, |
2457 | except ProjectVariable.DoesNotExist: | 2457 | except ProjectVariable.DoesNotExist: |
2458 | pass | 2458 | pass |
2459 | try: | ||
2460 | return_data['sdk_machine'] = ProjectVariable.objects.get(project = prj, name = "SDKMACHINE").value, | ||
2461 | except ProjectVariable.DoesNotExist: | ||
2462 | pass | ||
2463 | 2459 | ||
2464 | return HttpResponse(json.dumps( return_data ), content_type = "application/json") | 2460 | return HttpResponse(json.dumps( return_data ), content_type = "application/json") |
2465 | 2461 | ||
@@ -2868,11 +2864,6 @@ if True: | |||
2868 | context['package_classes_defined'] = "1" | 2864 | context['package_classes_defined'] = "1" |
2869 | except ProjectVariable.DoesNotExist: | 2865 | except ProjectVariable.DoesNotExist: |
2870 | pass | 2866 | pass |
2871 | try: | ||
2872 | context['sdk_machine'] = ProjectVariable.objects.get(project = prj, name = "SDKMACHINE").value | ||
2873 | context['sdk_machine_defined'] = "1" | ||
2874 | except ProjectVariable.DoesNotExist: | ||
2875 | pass | ||
2876 | 2867 | ||
2877 | return context | 2868 | return context |
2878 | 2869 | ||