summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builddetailspage.py20
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py14
2 files changed, 19 insertions, 15 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/bitbake/lib/bb/ui/crumbs/builddetailspage.py
index cd4413b18c..23aaacd891 100755
--- a/bitbake/lib/bb/ui/crumbs/builddetailspage.py
+++ b/bitbake/lib/bb/ui/crumbs/builddetailspage.py
@@ -81,16 +81,16 @@ class BuildConfigurationTreeView(gtk.TreeView):
81 # renew the tree model after get the configuration messages 81 # renew the tree model after get the configuration messages
82 self.set_model(listmodel) 82 self.set_model(listmodel)
83 83
84 def show(self, src_config_info, src_params): 84 def show(self, src_config_info):
85 vars = [] 85 vars = []
86 vars.append(self.set_vars("BB version:", src_params.bb_version)) 86 vars.append(self.set_vars("BB version:", src_config_info.bb_version))
87 vars.append(self.set_vars("Target arch:", src_params.target_arch)) 87 vars.append(self.set_vars("Target arch:", src_config_info.target_arch))
88 vars.append(self.set_vars("Target OS:", src_params.target_os)) 88 vars.append(self.set_vars("Target OS:", src_config_info.target_os))
89 vars.append(self.set_vars("Machine:", src_config_info.curr_mach)) 89 vars.append(self.set_vars("Machine:", src_config_info.curr_mach))
90 vars.append(self.set_vars("Distro:", src_config_info.curr_distro)) 90 vars.append(self.set_vars("Distro:", src_config_info.curr_distro))
91 vars.append(self.set_vars("Distro version:", src_params.distro_version)) 91 vars.append(self.set_vars("Distro version:", src_config_info.distro_version))
92 vars.append(self.set_vars("SDK machine:", src_config_info.curr_sdk_machine)) 92 vars.append(self.set_vars("SDK machine:", src_config_info.curr_sdk_machine))
93 vars.append(self.set_vars("Tune feature:", src_params.tune_pkgarch)) 93 vars.append(self.set_vars("Tune feature:", src_config_info.tune_pkgarch))
94 vars.append(self.set_vars("Layers:", src_config_info.layers)) 94 vars.append(self.set_vars("Layers:", src_config_info.layers))
95 95
96 for path in src_config_info.layers: 96 for path in src_config_info.layers:
@@ -105,6 +105,9 @@ class BuildConfigurationTreeView(gtk.TreeView):
105 105
106 self.set_config_model(vars) 106 self.set_config_model(vars)
107 107
108 def reset(self):
109 self.set_model(None)
110
108# 111#
109# BuildDetailsPage 112# BuildDetailsPage
110# 113#
@@ -208,6 +211,7 @@ class BuildDetailsPage (HobPage):
208 self.box_group_area.pack_start(self.vbox, expand=True, fill=True) 211 self.box_group_area.pack_start(self.vbox, expand=True, fill=True)
209 212
210 self.progress_bar.reset() 213 self.progress_bar.reset()
214 self.config_tv.reset()
211 self.vbox.pack_start(self.progress_box, expand=False, fill=False) 215 self.vbox.pack_start(self.progress_box, expand=False, fill=False)
212 216
213 self.vbox.pack_start(self.notebook, expand=True, fill=True) 217 self.vbox.pack_start(self.notebook, expand=True, fill=True)
@@ -244,5 +248,5 @@ class BuildDetailsPage (HobPage):
244 if (v_adj.upper <= v_adj.page_size) or (v_adj.value == v_adj.upper - v_adj.page_size): 248 if (v_adj.upper <= v_adj.page_size) or (v_adj.value == v_adj.upper - v_adj.page_size):
245 treeview.scroll_to_cell(path) 249 treeview.scroll_to_cell(path)
246 250
247 def show_configurations(self, configurations, params): 251 def show_configurations(self, configurations):
248 self.config_tv.show(configurations, params) 252 self.config_tv.show(configurations)
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index fda0ce0caa..95402e04ba 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -96,6 +96,12 @@ class Configuration:
96 self.conf_version = params["conf_version"] 96 self.conf_version = params["conf_version"]
97 self.lconf_version = params["lconf_version"] 97 self.lconf_version = params["lconf_version"]
98 self.image_fstypes = params["image_fstypes"] 98 self.image_fstypes = params["image_fstypes"]
99 self.tune_arch = params["tune_arch"]
100 self.bb_version = params["bb_version"]
101 self.target_arch = params["target_arch"]
102 self.target_os = params["target_os"]
103 self.distro_version = params["distro_version"]
104 self.tune_pkgarch = params["tune_pkgarch"]
99 # bblayers.conf 105 # bblayers.conf
100 self.layers = params["layer"].split() 106 self.layers = params["layer"].split()
101 107
@@ -201,12 +207,6 @@ class Parameters:
201 self.runnable_machine_patterns = params["runnable_machine_patterns"].split() 207 self.runnable_machine_patterns = params["runnable_machine_patterns"].split()
202 self.deployable_image_types = params["deployable_image_types"].split() 208 self.deployable_image_types = params["deployable_image_types"].split()
203 self.tmpdir = params["tmpdir"] 209 self.tmpdir = params["tmpdir"]
204 self.distro_version = params["distro_version"]
205 self.target_os = params["target_os"]
206 self.target_arch = params["target_arch"]
207 self.tune_pkgarch = params["tune_pkgarch"]
208 self.bb_version = params["bb_version"]
209 self.tune_arch = params["tune_arch"]
210 self.enable_proxy = False 210 self.enable_proxy = False
211 211
212class Builder(gtk.Window): 212class Builder(gtk.Window):
@@ -656,7 +656,7 @@ class Builder(gtk.Window):
656 elif self.current_step == self.PACKAGE_GENERATING: 656 elif self.current_step == self.PACKAGE_GENERATING:
657 fraction = 0 657 fraction = 0
658 self.build_details_page.update_progress_bar("Build Started: ", fraction) 658 self.build_details_page.update_progress_bar("Build Started: ", fraction)
659 self.build_details_page.show_configurations(self.configuration, self.parameters) 659 self.build_details_page.show_configurations(self.configuration)
660 660
661 def build_succeeded(self): 661 def build_succeeded(self):
662 if self.current_step == self.FAST_IMAGE_GENERATING: 662 if self.current_step == self.FAST_IMAGE_GENERATING: