diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2014-02-25 15:30:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-28 14:48:40 +0000 |
commit | ed19ed0db163acf9556048d01466b074403a0336 (patch) | |
tree | 25dfd00b5056f0823fd1fb52e407a1d2a998272e /bitbake/lib/bb/ui/crumbs | |
parent | 510560338d157630cd6c816adeb18d514a391883 (diff) | |
download | poky-ed19ed0db163acf9556048d01466b074403a0336.tar.gz |
bitbake: hob: create a base hob image used to create custom images
In order to remove hob-image.bb from meta-hob, a hob-image.bb should
be created somewhere in the build directory. I've saved it in build/recipes/images
directory, and moved the templates to recipes/images/custom (here are those
templates saved by the user).
The image is created when hob starts. Also it appends to BBFILES the directory
where it is created.
Removed images directory from meta-hob.
[YOCTO #5118]
(Bitbake rev: 4587297b51b7ca71d314bdb2c06f2061e7d4aa7d)
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')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 9 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 2 | ||||
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 5ae1ddb52f..1c8469b27e 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -446,7 +446,8 @@ class Builder(gtk.Window): | |||
446 | self.handler.connect("recipe-populated", self.handler_recipe_populated_cb) | 446 | self.handler.connect("recipe-populated", self.handler_recipe_populated_cb) |
447 | self.handler.connect("package-populated", self.handler_package_populated_cb) | 447 | self.handler.connect("package-populated", self.handler_package_populated_cb) |
448 | 448 | ||
449 | self.handler.append_to_bbfiles("${TOPDIR}/recipes/images/*.bb") | 449 | self.handler.append_to_bbfiles("${TOPDIR}/recipes/images/custom/*.bb") |
450 | self.handler.generate_hob_base_image() | ||
450 | self.initiate_new_build_async() | 451 | self.initiate_new_build_async() |
451 | 452 | ||
452 | signal.signal(signal.SIGINT, self.event_handle_SIGINT) | 453 | signal.signal(signal.SIGINT, self.event_handle_SIGINT) |
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 128207092d..e848405bbb 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
@@ -436,9 +436,16 @@ class HobHandler(gobject.GObject): | |||
436 | self.run_next_command(self.GENERATE_IMAGE) | 436 | self.run_next_command(self.GENERATE_IMAGE) |
437 | 437 | ||
438 | def generate_new_image(self, image, base_image, package_queue, description): | 438 | def generate_new_image(self, image, base_image, package_queue, description): |
439 | base_image = self.runCommand(["matchFile", self.base_image + ".bb"]) | 439 | if base_image: |
440 | base_image = self.runCommand(["matchFile", self.base_image + ".bb"]) | ||
440 | self.runCommand(["generateNewImage", image, base_image, package_queue, False, description]) | 441 | self.runCommand(["generateNewImage", image, base_image, package_queue, False, description]) |
441 | 442 | ||
443 | def generate_hob_base_image(self): | ||
444 | image_dir = self.get_topdir() + "/recipes/images/" | ||
445 | self.ensure_dir(image_dir) | ||
446 | self.generate_new_image(image_dir+"hob-image.bb", None, [], "") | ||
447 | self.append_to_bbfiles(image_dir + "*.bb") | ||
448 | |||
442 | def ensure_dir(self, directory): | 449 | def ensure_dir(self, directory): |
443 | self.runCommand(["ensureDir", directory]) | 450 | self.runCommand(["ensureDir", directory]) |
444 | 451 | ||
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index 6372592d23..c4fd3f746c 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | |||
@@ -379,7 +379,7 @@ class ImageConfigurationPage (HobPage): | |||
379 | selected_image = self.image_combo.get_active_text() | 379 | selected_image = self.image_combo.get_active_text() |
380 | if selected_image == self.__custom_image__: | 380 | if selected_image == self.__custom_image__: |
381 | topdir = self.builder.get_topdir() | 381 | topdir = self.builder.get_topdir() |
382 | images_dir = topdir + "/recipes/images/" | 382 | images_dir = topdir + "/recipes/images/custom/" |
383 | self.builder.ensure_dir(images_dir) | 383 | self.builder.ensure_dir(images_dir) |
384 | 384 | ||
385 | dialog = RetrieveImageDialog(images_dir, "Select from my image recipes", | 385 | dialog = RetrieveImageDialog(images_dir, "Select from my image recipes", |
diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py index 271635fe11..352e9489fd 100755 --- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py | |||
@@ -632,7 +632,7 @@ class ImageDetailsPage (HobPage): | |||
632 | 632 | ||
633 | def save_button_clicked_cb(self, button): | 633 | def save_button_clicked_cb(self, button): |
634 | topdir = self.builder.get_topdir() | 634 | topdir = self.builder.get_topdir() |
635 | images_dir = topdir + "/recipes/images/" | 635 | images_dir = topdir + "/recipes/images/custom/" |
636 | self.builder.ensure_dir(images_dir) | 636 | self.builder.ensure_dir(images_dir) |
637 | 637 | ||
638 | self.name_field_template = self.builder.image_configuration_page.custom_image_selected | 638 | self.name_field_template = self.builder.image_configuration_page.custom_image_selected |