diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2013-05-07 11:07:56 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-10 13:33:33 +0100 |
commit | d98419ae706c33f2d031598cb0914616bc7dfaa0 (patch) | |
tree | c7f447450c493610a471c9fe49cad2d00f84757b /bitbake/lib/bb/ui/crumbs/packageselectionpage.py | |
parent | 9c60292b6fc1effdb6a7d41453e3ff7db850e178 (diff) | |
download | poky-d98419ae706c33f2d031598cb0914616bc7dfaa0.tar.gz |
bitbake: hob: assure consistency for image size label
After the image was build, update the image size in the packagelistpage.
[YOCTO #4388]
(Bitbake rev: 4d6d02e61b32d1d710c708774f08cc5e7764415d)
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/packageselectionpage.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py index a4d86bd610..0cac92f026 100755 --- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py | |||
@@ -270,14 +270,17 @@ class PackageSelectionPage (HobPage): | |||
270 | selected_packages_size = self.package_model.get_packages_size() | 270 | selected_packages_size = self.package_model.get_packages_size() |
271 | selected_packages_size_str = HobPage._size_to_string(selected_packages_size) | 271 | selected_packages_size_str = HobPage._size_to_string(selected_packages_size) |
272 | 272 | ||
273 | image_overhead_factor = self.builder.configuration.image_overhead_factor | 273 | if self.builder.configuration.image_packages == self.builder.configuration.selected_packages: |
274 | image_rootfs_size = self.builder.configuration.image_rootfs_size / 1024 # image_rootfs_size is KB | 274 | image_total_size_str = self.builder.configuration.image_size |
275 | image_extra_size = self.builder.configuration.image_extra_size / 1024 # image_extra_size is KB | 275 | else: |
276 | base_size = image_overhead_factor * selected_packages_size | 276 | image_overhead_factor = self.builder.configuration.image_overhead_factor |
277 | image_total_size = max(base_size, image_rootfs_size) + image_extra_size | 277 | image_rootfs_size = self.builder.configuration.image_rootfs_size / 1024 # image_rootfs_size is KB |
278 | if "zypper" in self.builder.configuration.selected_packages: | 278 | image_extra_size = self.builder.configuration.image_extra_size / 1024 # image_extra_size is KB |
279 | image_total_size += (51200 * 1024) | 279 | base_size = image_overhead_factor * selected_packages_size |
280 | image_total_size_str = HobPage._size_to_string(image_total_size) | 280 | image_total_size = max(base_size, image_rootfs_size) + image_extra_size |
281 | if "zypper" in self.builder.configuration.selected_packages: | ||
282 | image_total_size += (51200 * 1024) | ||
283 | image_total_size_str = HobPage._size_to_string(image_total_size) | ||
281 | 284 | ||
282 | self.label.set_label("Packages included: %s\nSelected packages size: %s\nTotal image size: %s" % | 285 | self.label.set_label("Packages included: %s\nSelected packages size: %s\nTotal image size: %s" % |
283 | (selected_packages_num, selected_packages_size_str, image_total_size_str)) | 286 | (selected_packages_num, selected_packages_size_str, image_total_size_str)) |
@@ -297,6 +300,7 @@ class PackageSelectionPage (HobPage): | |||
297 | self.refresh_selection() | 300 | self.refresh_selection() |
298 | if not self.builder.customized: | 301 | if not self.builder.customized: |
299 | self.builder.customized = True | 302 | self.builder.customized = True |
303 | self.builder.configuration.initial_selected_image = self.builder.configuration.selected_image | ||
300 | self.builder.configuration.selected_image = self.recipe_model.__custom_image__ | 304 | self.builder.configuration.selected_image = self.recipe_model.__custom_image__ |
301 | self.builder.rcppkglist_populated() | 305 | self.builder.rcppkglist_populated() |
302 | 306 | ||