summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-04-09 14:13:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-10 23:04:45 (GMT)
commit47caae2f2185cb9b1b8e597189128c57f47cc940 (patch)
treec4ba24ac7a7e19bbb7657cae8238da1d5d6fa89c
parent27caa6b89d36af9105dc62c7735f159d3c6df64e (diff)
downloadpoky-47caae2f2185cb9b1b8e597189128c57f47cc940.tar.gz
Hob: clean up and unify the steps for RCPPKGINFO_POPULATING to call populate_recipe_package_info_async()
For the steps in RCPPKGINFO_POPULATING, This patch consolidates them into populate_recipe_package_info_async() to call. (Bitbake rev: ed2aa6f235e1b789af8a33729302a4269674c6b4) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py14
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py2
2 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 6ed15e9..63e6f0b 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -342,6 +342,12 @@ class Builder(gtk.Window):
342 self.set_user_config() 342 self.set_user_config()
343 self.handler.parse_generate_configuration() 343 self.handler.parse_generate_configuration()
344 344
345 def populate_recipe_package_info_async(self):
346 self.switch_page(self.RCPPKGINFO_POPULATING)
347 # Parse recipes
348 self.set_user_config()
349 self.handler.generate_recipes()
350
345 def load_template(self, path): 351 def load_template(self, path):
346 self.template = TemplateMgr() 352 self.template = TemplateMgr()
347 self.template.load(path) 353 self.template.load(path)
@@ -383,7 +389,6 @@ class Builder(gtk.Window):
383 # MACHINE CHANGED action or SETTINGS CHANGED 389 # MACHINE CHANGED action or SETTINGS CHANGED
384 # show the progress bar 390 # show the progress bar
385 self.image_configuration_page.show_info_populating() 391 self.image_configuration_page.show_info_populating()
386 self.generate_recipes()
387 392
388 elif next_step == self.RCPPKGINFO_POPULATED: 393 elif next_step == self.RCPPKGINFO_POPULATED:
389 self.image_configuration_page.show_info_populated() 394 self.image_configuration_page.show_info_populated()
@@ -465,11 +470,6 @@ class Builder(gtk.Window):
465 self.handler.reset_build() 470 self.handler.reset_build()
466 self.handler.generate_packages(all_recipes) 471 self.handler.generate_packages(all_recipes)
467 472
468 def generate_recipes(self):
469 # Parse recipes
470 self.set_user_config()
471 self.handler.generate_recipes()
472
473 def generate_image(self): 473 def generate_image(self):
474 # Build image 474 # Build image
475 self.set_user_config() 475 self.set_user_config()
@@ -888,7 +888,7 @@ class Builder(gtk.Window):
888 if not self.configuration.curr_mach: 888 if not self.configuration.curr_mach:
889 self.update_config_async() 889 self.update_config_async()
890 else: 890 else:
891 self.switch_page(self.RCPPKGINFO_POPULATING) 891 self.populate_recipe_package_info_async()
892 892
893 def deploy_image(self, image_name): 893 def deploy_image(self, image_name):
894 if not image_name: 894 if not image_name:
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index 9013e1e..900244f 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -260,7 +260,7 @@ class ImageConfigurationPage (HobPage):
260 260
261 self.builder.configuration.curr_mach = combo_item 261 self.builder.configuration.curr_mach = combo_item
262 # Do reparse recipes 262 # Do reparse recipes
263 self.builder.switch_page(self.builder.RCPPKGINFO_POPULATING) 263 self.builder.populate_recipe_package_info_async()
264 264
265 def update_machine_combo(self): 265 def update_machine_combo(self):
266 all_machines = self.builder.parameters.all_machines 266 all_machines = self.builder.parameters.all_machines