diff options
author | Liming An <limingx.l.an@intel.com> | 2012-06-01 18:40:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-08 12:13:14 +0100 |
commit | 6ac1545453b3ff24422c9d2eea17996c041fb483 (patch) | |
tree | e00391db73ef4044a7a06431f91c7adb021fb2dd /bitbake/lib/bb/ui/crumbs/imagedetailspage.py | |
parent | 7f806be2b0f894725e806c594670a7bea5ff4f1c (diff) | |
download | poky-6ac1545453b3ff24422c9d2eea17996c041fb483.tar.gz |
Hob: clear the repeated function get_kernel_file_name
there are a repeated function in builder.py and imagedetailspage.py,
so combine them to one.
(Bitbake rev: 4bada20cd244a2dd6d72acd38f0cadc90453e60b)
Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/imagedetailspage.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py index deb053c4c9..1ab80f8277 100755 --- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py | |||
@@ -368,7 +368,7 @@ class ImageDetailsPage (HobPage): | |||
368 | iter = model.get_iter(path) | 368 | iter = model.get_iter(path) |
369 | image_name = model[path][0] | 369 | image_name = model[path][0] |
370 | if iter and model[path][2] == 'runnable': | 370 | if iter and model[path][2] == 'runnable': |
371 | kernel_name, kernel_number = self.get_kernel_file_name(image_name) | 371 | kernel_name, kernel_number = self.builder.parameters.get_kernel_file_name() |
372 | self.builder.runqemu_image(image_name, kernel_name, kernel_number) | 372 | self.builder.runqemu_image(image_name, kernel_name, kernel_number) |
373 | 373 | ||
374 | def create_bottom_buttons(self, buttonlist, image_name): | 374 | def create_bottom_buttons(self, buttonlist, image_name): |
@@ -446,23 +446,6 @@ class ImageDetailsPage (HobPage): | |||
446 | button_id = build_new_button.connect("clicked", self.build_new_button_clicked_cb) | 446 | button_id = build_new_button.connect("clicked", self.build_new_button_clicked_cb) |
447 | self.button_ids[button_id] = build_new_button | 447 | self.button_ids[button_id] = build_new_button |
448 | 448 | ||
449 | def get_kernel_file_name(self, image_name): | ||
450 | name_list = [] | ||
451 | kernel_name = "" | ||
452 | if image_name: | ||
453 | image_path = os.path.join(self.builder.parameters.image_addr) | ||
454 | files = [f for f in os.listdir(image_path) if f[0] <> '.'] | ||
455 | for check_file in files: | ||
456 | if check_file.endswith(".bin"): | ||
457 | if self.test_mach_runnable(check_file): | ||
458 | selected_machine = self.builder.configuration.curr_mach | ||
459 | if selected_machine in check_file: | ||
460 | kernel_name = check_file | ||
461 | if not os.path.islink(os.path.join(image_path, check_file)): | ||
462 | name_list.append(check_file) | ||
463 | |||
464 | return kernel_name, len(name_list) | ||
465 | |||
466 | def save_button_clicked_cb(self, button): | 449 | def save_button_clicked_cb(self, button): |
467 | self.builder.show_save_template_dialog() | 450 | self.builder.show_save_template_dialog() |
468 | 451 | ||