summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/crumbs/builder.py
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-03-19 11:08:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-22 14:40:39 +0000
commit8683fa2d6302f37c12730ba872da778873939037 (patch)
treebef0cd55b63739f649be326b8de75d745d3bbffc /bitbake/lib/bb/ui/crumbs/builder.py
parente9a9422ec38a096ab64dd0b15382c1a40b7a1fc9 (diff)
downloadpoky-8683fa2d6302f37c12730ba872da778873939037.tar.gz
Hob: Remove split model in GTK Hob
Since the GTK Hob will not use the server/client split model, thus remove it from current Hob code. But we still keep the core mechanism in bitbake server. (From Poky rev: 983ea0265a53e0725dcbf9085ea767ebbc155ae5) (Bitbake rev: 8c129e05a94d457860d883c9b2934a5559de8d9b) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index b1aad54eed..d3b13c93af 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -260,21 +260,14 @@ class Builder(gtk.Window):
260 self.show_all() 260 self.show_all()
261 self.nb.set_current_page(0) 261 self.nb.set_current_page(0)
262 262
263 def get_split_model(self):
264 return self.handler.split_model
265
266 def load_template(self, path): 263 def load_template(self, path):
267 self.template = TemplateMgr() 264 self.template = TemplateMgr()
268 self.template.load(path) 265 self.template.load(path)
269 self.configuration.load(self.template) 266 self.configuration.load(self.template)
270 267
271 if self.get_split_model(): 268 for layer in self.configuration.layers:
272 if not set(self.configuration.layers) <= set(self.parameters.all_layers): 269 if not os.path.exists(layer+'/conf/layer.conf'):
273 return False 270 return False
274 else:
275 for layer in self.configuration.layers:
276 if not os.path.exists(layer+'/conf/layer.conf'):
277 return False
278 271
279 self.switch_page(self.LAYER_CHANGED) 272 self.switch_page(self.LAYER_CHANGED)
280 273
@@ -674,7 +667,6 @@ class Builder(gtk.Window):
674 dialog = LayerSelectionDialog(title = "Layer Selection", 667 dialog = LayerSelectionDialog(title = "Layer Selection",
675 layers = copy.deepcopy(self.configuration.layers), 668 layers = copy.deepcopy(self.configuration.layers),
676 all_layers = self.parameters.all_layers, 669 all_layers = self.parameters.all_layers,
677 split_model = self.get_split_model(),
678 parent = self, 670 parent = self,
679 flags = gtk.DIALOG_MODAL 671 flags = gtk.DIALOG_MODAL
680 | gtk.DIALOG_DESTROY_WITH_PARENT 672 | gtk.DIALOG_DESTROY_WITH_PARENT
@@ -748,7 +740,6 @@ class Builder(gtk.Window):
748 all_distros = self.parameters.all_distros, 740 all_distros = self.parameters.all_distros,
749 all_sdk_machines = self.parameters.all_sdk_machines, 741 all_sdk_machines = self.parameters.all_sdk_machines,
750 max_threads = self.parameters.max_threads, 742 max_threads = self.parameters.max_threads,
751 split_model = self.get_split_model(),
752 parent = self, 743 parent = self,
753 flags = gtk.DIALOG_MODAL 744 flags = gtk.DIALOG_MODAL
754 | gtk.DIALOG_DESTROY_WITH_PARENT 745 | gtk.DIALOG_DESTROY_WITH_PARENT