Hob: bug fixes
cover Hob: bug fixes
The following changes since commit de4cdfd6bc1280ac7ac0559b87734d26294ef773:
documentation/kernel-manual/kernel-how-to.xml: Updated to kernel 3.4 (2012-05-31 21:16:55 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib limx/hob-bug-fixes-continue
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=limx/hob-bug-fixes-continue
Liming An (3):
Hob: clear the repeated function get_kernel_file_name
Hob: fix entry of recipe page can't be edited in case after clicked
clear button
Hob: fixed a definition not match issue when click choose directflb
in package page
bitbake/lib/bb/ui/crumbs/builder.py | 5 +++-- bitbake/lib/bb/ui/crumbs/hobwidget.py | 10 ++-------- bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 19 +------------------ bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 2 +- 4 files changed, 7 insertions(+), 29 deletions(-)
Signature · 1 line
1.7.5.4
PATCH 1/3 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/lib/bb/ui/crumbs/builder.py | 5 +++-- bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 19 +------------------ 2 files changed, 4 insertions(+), 20 deletions(-)
bitbake/lib/bb/ui/crumbs/builder.py +3 -2
@@ -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
@@ -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()
Signature · 1 line
1.7.5.4
PATCH 2/3 Hob: fix entry of recipe page can't be edited in case after clicked clear button
cancel some inviable code and fixed this issue
--- bitbake/lib/bb/ui/crumbs/hobwidget.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)
bitbake/lib/bb/ui/crumbs/hobwidget.py +2 -8
@@ -529,14 +529,8 @@ class HobNotebook(gtk.Notebook): self.reset_entry(search) def set_search_entry_clear_cb(self, search, icon_pos, event): - self.reset_entry(search) - - def set_page(self, title): - for child in self.tabbar.children: - if child["title"] == title: - self.tabbar.current_child = child - self.tabbar.grab_focus() - self.notebook.set_current_page(child["toggled_page"]) + if search.get_editable() == True: + search.set_text("") class HobWarpCellRendererText(gtk.CellRendererText): def __init__(self, col_number):
Signature · 1 line
1.7.5.4
PATCH 3/3 Hob: fixed a definition not match issue when click choose directflb in package page
In reply to Liming An[YOCTO #2526]
--- bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
bitbake/lib/bb/ui/crumbs/packageselectionpage.py +1 -1
@@ -215,7 +215,7 @@ class PackageSelectionPage (HobPage): self.refresh_selection() if not self.builder.customized: self.builder.customized = True - self.builder.configuration.selected_image = self.recipe_model.__dummy_image__ + self.builder.configuration.selected_image = self.recipe_model.__custom_image__ self.builder.rcppkglist_populated() self.builder.window_sensitive(True)
Signature · 1 line
1.7.5.4
Richard Purdie
AppliedQuoted 8 lines · Liming An
The following changes since commit
de4cdfd6bc1280ac7ac0559b87734d26294ef773:
documentation/kernel-manual/kernel-how-to.xml: Updated to kernel 3.4 (2012-05-31 21:16:55 +0100)are available in the git repository at:
git://git.pokylinux.org/poky-contriblimx/hob-bug-fixes-continue
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=limx/hob-bug-fixes-continue
Quoted 6 lines
Liming An (3):
Hob: clear the repeated functionget_kernel_file_name
Hob: fix entry of recipe page can't be edited in case after clicked
clear button
Hob: fixed a definition not match issue when click choose directflb
in package page
Merged to master, thanks.
Richard