diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index d57cf4c322..9da926dd14 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -190,20 +190,6 @@ class Configuration: | |||
190 | self.split_proxy("cvs", params["cvs_proxy_host"] + ":" + params["cvs_proxy_port"]) | 190 | self.split_proxy("cvs", params["cvs_proxy_host"] + ":" + params["cvs_proxy_port"]) |
191 | 191 | ||
192 | def load(self, template): | 192 | def load(self, template): |
193 | self.curr_mach = template.getVar("MACHINE") | ||
194 | self.curr_package_format = " ".join(template.getVar("PACKAGE_CLASSES").split("package_")).strip() | ||
195 | self.curr_distro = template.getVar("DISTRO") | ||
196 | self.dldir = template.getVar("DL_DIR") | ||
197 | self.sstatedir = template.getVar("SSTATE_DIR") | ||
198 | self.sstatemirror = template.getVar("SSTATE_MIRRORS") | ||
199 | try: | ||
200 | self.pmake = int(template.getVar("PARALLEL_MAKE").split()[1]) | ||
201 | except: | ||
202 | pass | ||
203 | try: | ||
204 | self.bbthread = int(template.getVar("BB_NUMBER_THREADS")) | ||
205 | except: | ||
206 | pass | ||
207 | try: | 193 | try: |
208 | self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE")) | 194 | self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE")) |
209 | except: | 195 | except: |
@@ -215,13 +201,9 @@ class Configuration: | |||
215 | # image_overhead_factor is read-only. | 201 | # image_overhead_factor is read-only. |
216 | self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE") | 202 | self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE") |
217 | self.curr_sdk_machine = template.getVar("SDKMACHINE") | 203 | self.curr_sdk_machine = template.getVar("SDKMACHINE") |
218 | self.conf_version = template.getVar("CONF_VERSION") | ||
219 | self.lconf_version = template.getVar("LCONF_VERSION") | ||
220 | self.extra_setting = eval(template.getVar("EXTRA_SETTING")) | 204 | self.extra_setting = eval(template.getVar("EXTRA_SETTING")) |
221 | self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD")) | 205 | self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD")) |
222 | self.image_fstypes = template.getVar("IMAGE_FSTYPES") | 206 | self.image_fstypes = template.getVar("IMAGE_FSTYPES") |
223 | # bblayers.conf | ||
224 | self.layers = template.getVar("BBLAYERS").split() | ||
225 | # image/recipes/packages | 207 | # image/recipes/packages |
226 | self.selected_image = template.getVar("__SELECTED_IMAGE__") | 208 | self.selected_image = template.getVar("__SELECTED_IMAGE__") |
227 | self.selected_recipes = template.getVar("DEPENDS").split() | 209 | self.selected_recipes = template.getVar("DEPENDS").split() |
@@ -561,11 +543,10 @@ class Builder(gtk.Window): | |||
561 | 543 | ||
562 | def initiate_new_build_async(self): | 544 | def initiate_new_build_async(self): |
563 | self.switch_page(self.MACHINE_SELECTION) | 545 | self.switch_page(self.MACHINE_SELECTION) |
564 | if self.load_template(TemplateMgr.convert_to_template_pathfilename("default", ".hob/")) == False: | 546 | self.show_sanity_check_page() |
565 | self.show_sanity_check_page() | 547 | self.handler.init_cooker() |
566 | self.handler.init_cooker() | 548 | self.handler.set_extra_inherit("image_types") |
567 | self.handler.set_extra_inherit("image_types") | 549 | self.generate_configuration() |
568 | self.generate_configuration() | ||
569 | 550 | ||
570 | def update_config_async(self): | 551 | def update_config_async(self): |
571 | self.switch_page(self.MACHINE_SELECTION) | 552 | self.switch_page(self.MACHINE_SELECTION) |