mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Hob: clear the repeated function get_kernel_file_name

Browse Source 
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>
This commit is contained in:
Liming An
2012-06-01 18:40:57 +08:00
committed by Richard Purdie
parent 7f806be2b0
commit 6ac1545453
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/ui/crumbs/builder.py
+3 -2
View File
@@ -1141,9 +1141,10 @@ class Builder(gtk.Window):
response = dialog.run()
dialog.destroy()
def get_kernel_file_name(self, image_path):
def get_kernel_file_name(self):
name_list = []
kernel_name = ""
image_path = self.parameters.image_addr
if image_path:
files = [f for f in os.listdir(image_path) if f[0] <> '.']
for check_file in files:
@@ -1166,7 +1167,7 @@ class Builder(gtk.Window):
dialog.destroy()
return
kernel_name, kernels_number = self.get_kernel_file_name(self.parameters.image_addr)
kernel_name, kernels_number = self.get_kernel_file_name()
if not kernel_name or kernels_number > 1:
dialog = gtk.FileChooserDialog("Load Kernel Files", self,
gtk.FILE_CHOOSER_ACTION_SAVE)
bitbake/lib/bb/ui/crumbs/imagedetailspage.py
+1 -18
View File
@@ -368,7 +368,7 @@ class ImageDetailsPage (HobPage):
iter = model.get_iter(path)
image_name = model[path][0]
if iter and model[path][2] == 'runnable':
kernel_name, kernel_number = self.get_kernel_file_name(image_name)
kernel_name, kernel_number = self.builder.parameters.get_kernel_file_name()
self.builder.runqemu_image(image_name, kernel_name, kernel_number)
def create_bottom_buttons(self, buttonlist, image_name):
@@ -446,23 +446,6 @@ class ImageDetailsPage (HobPage):
button_id = build_new_button.connect("clicked", self.build_new_button_clicked_cb)
self.button_ids[button_id] = build_new_button
def get_kernel_file_name(self, image_name):
name_list = []
kernel_name = ""
if image_name:
image_path = os.path.join(self.builder.parameters.image_addr)
files = [f for f in os.listdir(image_path) if f[0] <> '.']
for check_file in files:
if check_file.endswith(".bin"):
if self.test_mach_runnable(check_file):
selected_machine = self.builder.configuration.curr_mach
if selected_machine in check_file:
kernel_name = check_file
if not os.path.islink(os.path.join(image_path, check_file)):
name_list.append(check_file)
return kernel_name, len(name_list)
def save_button_clicked_cb(self, button):
self.builder.show_save_template_dialog()