Skip to contentSkip to conversation

CONSOLIDATED PULL: bitbake changes for master (cover letter only)

PATCH New Paul Eggleton 1 participant 3 messages Aug 6, 2013

lore
Share & tools
lore
#0 lore raw

cover CONSOLIDATED PULL: bitbake changes for master (cover letter only)

These have been tested locally and reviewed by me.

The following changes (against poky, but apply cleanly to bitbake master with -p2) are available in the git repository at:

git://git.yoctoproject.org/poky-contrib paule/bitbake
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/bitbake

Cristiana Voicu (18):
hob/advancedsettings: change toolchain labels to sdk labels hob/packageslist: change image size label to estimated image size
hob: labelling changes in Hob
hob: create save image dialog used to save a template hob/bitbake: create a template (a .bb file) from hob through bitbake hob/bitbake: save the description of a custom image
hob: make changes in order to permit from UI to edit an image after
saving it
hob & bitbake: append a value to a variable from hob throught bitbake
hob: change the name and description for the saveimagedialog
hob: the saved image should be editable
hob/bitbake: when an image is saved, it should require an image from
layers
hob: changes to image combo box
hob: retrieve file name of an image
hob: implement the "retrieve image dialog" + changes to image combo
box
cooker: save packages in IMAGE_INSTALL instead of PACKAGE_INSTALL
hob: set focus on entry name when the name is not correct hob/imagedetailspage: add tooltip for save image recipe button hob/imageconfigurationpage: changes to image combobox

Ross Burton (3):
depexp: make parse() a member function
depexp: insert data instead of append/set, for speed
depexp: fix typo in variable name

 bitbake/lib/bb/command.py                          |  14 +-
 bitbake/lib/bb/cooker.py                           |  71 ++++++++--
 bitbake/lib/bb/data.py                             |   4 +
 bitbake/lib/bb/ui/crumbs/builder.py                |  15 ++
 .../lib/bb/ui/crumbs/hig/advancedsettingsdialog.py |  21 +--
 .../lib/bb/ui/crumbs/hig/retrieveimagedialog.py    |  49 +++++++
 bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py    | 151 +++++++++++++++++++++
 bitbake/lib/bb/ui/crumbs/hobeventhandler.py        |  25 +++-
 bitbake/lib/bb/ui/crumbs/hoblistmodel.py           |  40 ++++--
 bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py |  76 ++++++++---
 bitbake/lib/bb/ui/crumbs/imagedetailspage.py       |  44 +++++-
 bitbake/lib/bb/ui/crumbs/packageselectionpage.py   |   2 +-
 bitbake/lib/bb/ui/depexp.py                        |  28 ++--
 13 files changed, 461 insertions(+), 79 deletions(-)
 create mode 100644 bitbake/lib/bb/ui/crumbs/hig/retrieveimagedialog.py
 create mode 100644 bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 10/21 hob: the saved image should be editable

From: Cristiana Voicu <[email protected]>

Also, the image can be saved when the a name is filled.

[YOCTO #4193]
---
 bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py +3 -1
index a20afcd..644a4a4 100644
@@ -99,7 +99,8 @@ class SaveImageDialog (CrumbsDialog):
         self.save_button.set_label("Save")
         self.save_button.connect("clicked", self.save_button_cb)
         self.save_button.set_size_request(110, 30)
-        self.save_button.set_sensitive(False)
+        if self.name_entry.get_text() == '':
+            self.save_button.set_sensitive(False)
 
         table.attach(cancel_button, 2, 3, 0, 1)
         table.attach(self.save_button, 3, 4, 0, 1)
@@ -124,6 +125,7 @@ class SaveImageDialog (CrumbsDialog):
         description = description_buffer.get_text(description_buffer.get_start_iter(),description_buffer.get_end_iter())
         if new_text.islower() and new_text.isalnum():
             self.builder.image_details_page.image_saved = True
+            self.builder.customized = False
             self.builder.generate_new_image(self.directory+text, description)
             self.builder.recipe_model.set_in_list(text, description)
             self.builder.recipe_model.set_selected_image(text)
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 20/21 depexp: insert data instead of append/set, for speed

In reply to Paul Eggleton

From: Ross Burton <[email protected]>

---
 bitbake/lib/bb/ui/depexp.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
bitbake/lib/bb/ui/depexp.py +3 -9
index b7e6f8f..03ed823 100644
@@ -165,21 +165,15 @@ class DepExplorer(gtk.Window):
 
     def parse(self, depgraph):
         for package in depgraph["pn"]:
-            self.pkg_model.set(self.pkg_model.append(), COL_PKG_NAME, package)
+            self.pkg_model.insert(0, (package,))
 
         for package in depgraph["depends"]:
             for depend in depgraph["depends"][package]:
-                self.depends_model.set (self.depends_model.append(),
-                                        COL_DEP_TYPE, TYPE_DEP,
-                                        COL_DEP_PARENT, package,
-                                        COL_DEP_PACKAGE, depend)
+                self.depends_model.insert (0, (TYPE_DEP, package, depend))
 
         for package in depgraph["rdepends-pn"]:
             for rdepend in depgraph["rdepends-pn"][package]:
-                self.depends_model.set (self.depends_model.append(),
-                                        COL_DEP_TYPE, TYPE_RDEP,
-                                        COL_DEP_PARENT, package,
-                                        COL_DEP_PACKAGE, rdepend)
+                self.depends_model.insert (0, (TYPE_RDEP, package, rdepend))
 
 
 class gtkthread(threading.Thread):
Signature · 1 line
1.8.1.2