summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-08-02 14:57:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-06 13:02:23 +0100
commit4c96451fa500b13f0ff748fe7a85859c0573b311 (patch)
tree0ab28bb257e15b5924eef49a426b1456f989ad8e /bitbake/lib
parent62c0f6cb613d36f1521612fccd7fcb53f0951169 (diff)
downloadpoky-4c96451fa500b13f0ff748fe7a85859c0573b311.tar.gz
bitbake: hob/advancedsettings: change toolchain labels to sdk labels
In order to be easier for the user to understand, we have changed the toolchain labels to sdk. [YOCTO #3808] (Bitbake rev: 008afbcf6b1b315eb5463ecfb39fc50e6303687e) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py b/bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py
index bbcaba8c70..86a65aee35 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py
+++ b/bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py
@@ -131,7 +131,7 @@ class AdvancedSettingsDialog (CrumbsDialog, SettingsUIHelper):
131 self.rootfs_size_spinner = None 131 self.rootfs_size_spinner = None
132 self.extra_size_spinner = None 132 self.extra_size_spinner = None
133 self.gplv3_checkbox = None 133 self.gplv3_checkbox = None
134 self.toolchain_checkbox = None 134 self.sdk_checkbox = None
135 self.image_types_checkbuttons = {} 135 self.image_types_checkbuttons = {}
136 136
137 self.md5 = self.config_md5() 137 self.md5 = self.config_md5()
@@ -286,16 +286,17 @@ class AdvancedSettingsDialog (CrumbsDialog, SettingsUIHelper):
286 self.gplv3_checkbox.set_active(False) 286 self.gplv3_checkbox.set_active(False)
287 advanced_vbox.pack_start(self.gplv3_checkbox, expand=False, fill=False) 287 advanced_vbox.pack_start(self.gplv3_checkbox, expand=False, fill=False)
288 288
289 advanced_vbox.pack_start(self.gen_label_widget('<span weight="bold">Toolchain</span>'), expand=False, fill=False) 289 advanced_vbox.pack_start(self.gen_label_widget('<span weight="bold">SDK</span>'), expand=False, fill=False)
290 sub_hbox = gtk.HBox(False, 6) 290 sub_hbox = gtk.HBox(False, 6)
291 advanced_vbox.pack_start(sub_hbox, expand=False, fill=False) 291 advanced_vbox.pack_start(sub_hbox, expand=False, fill=False)
292 self.toolchain_checkbox = gtk.CheckButton("Build toolchain") 292 self.sdk_checkbox = gtk.CheckButton("Populate SDK")
293 self.toolchain_checkbox.set_tooltip_text("Check this box to build the related toolchain with your image") 293 tooltip = "Check this box to generate an SDK tarball that consists of the cross-toolchain and a sysroot that contains development packages for your image."
294 self.toolchain_checkbox.set_active(self.configuration.toolchain_build) 294 self.sdk_checkbox.set_tooltip_text(tooltip)
295 sub_hbox.pack_start(self.toolchain_checkbox, expand=False, fill=False) 295 self.sdk_checkbox.set_active(self.configuration.toolchain_build)
296 296 sub_hbox.pack_start(self.sdk_checkbox, expand=False, fill=False)
297 tooltip = "Selects the host platform for which you want to run the toolchain" 297
298 sdk_machine_widget, self.sdk_machine_combo = self.gen_combo_widget(self.configuration.curr_sdk_machine, self.all_sdk_machines,"<b>Build toolchain</b>" + "*" + tooltip) 298 tooltip = "Select the host platform for which you want to run the toolchain contained in the SDK tarball."
299 sdk_machine_widget, self.sdk_machine_combo = self.gen_combo_widget(self.configuration.curr_sdk_machine, self.all_sdk_machines,"<b>Populate SDK</b>" + "*" + tooltip)
299 sub_hbox.pack_start(sdk_machine_widget, expand=False, fill=False) 300 sub_hbox.pack_start(sdk_machine_widget, expand=False, fill=False)
300 301
301 return advanced_vbox 302 return advanced_vbox
@@ -330,7 +331,7 @@ class AdvancedSettingsDialog (CrumbsDialog, SettingsUIHelper):
330 self.configuration.incompat_license = " ".join(self.configuration.incompat_license or []) 331 self.configuration.incompat_license = " ".join(self.configuration.incompat_license or [])
331 self.configuration.incompat_license = self.configuration.incompat_license.strip() 332 self.configuration.incompat_license = self.configuration.incompat_license.strip()
332 333
333 self.configuration.toolchain_build = self.toolchain_checkbox.get_active() 334 self.configuration.toolchain_build = self.sdk_checkbox.get_active()
334 self.configuration.curr_sdk_machine = self.sdk_machine_combo.get_active_text() 335 self.configuration.curr_sdk_machine = self.sdk_machine_combo.get_active_text()
335 md5 = self.config_md5() 336 md5 = self.config_md5()
336 self.settings_changed = (self.md5 != md5) 337 self.settings_changed = (self.md5 != md5)