diff options
author | Marius Avram <marius.avram@intel.com> | 2014-03-18 14:17:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-24 17:54:46 +0000 |
commit | 299fbbf31aa99d360a7ca884d1f0e0dff24d8887 (patch) | |
tree | 2f5a3bfdca6e186b16893aa288d6f727d3176578 /bitbake/lib/bb/ui/crumbs/builder.py | |
parent | 7dd4bf6310c61828dc2ac7777f5adf1004349715 (diff) | |
download | poky-299fbbf31aa99d360a7ca884d1f0e0dff24d8887.tar.gz |
bitbake: hob: output filenames based on initial recipe name
If a recipe for an image was edited from the hob interface the name
of the files outputed in the <build_dir>/tmp/deploy/images/${MACHINE}/ and the
temporary recipes from <build_dir>/recipes/images/ contained only the
generic name "hob-image". From now on both the temporary recipes and
the output from the deploy/ directory will contain the name of the base
recipe appended by the "-edited" suffix, in the case when a base image recipe was
edited. The base recipe can be a standard recipe (e.g core-image-minimal) or
a custom created and saved by the user.
For example, if core-image-minimal is edited the deploy/ directory will contain
core-image-minimal-edited-20140318-140428-qemux86.ext3 and the recipes/images/
directory will contain the recipe core-image-minimal-edited-20140318-140428.bb.
[YOCTO #5002]
(Bitbake rev: f34575809677dc52e1071a3ae3daebe92819cec0)
Signed-off-by: Marius Avram <marius.avram@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 1c8469b27e..9adb1f7ba3 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -447,7 +447,6 @@ class Builder(gtk.Window): | |||
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/custom/*.bb") | 449 | self.handler.append_to_bbfiles("${TOPDIR}/recipes/images/custom/*.bb") |
450 | self.handler.generate_hob_base_image() | ||
451 | self.initiate_new_build_async() | 450 | self.initiate_new_build_async() |
452 | 451 | ||
453 | signal.signal(signal.SIGINT, self.event_handle_SIGINT) | 452 | signal.signal(signal.SIGINT, self.event_handle_SIGINT) |
@@ -738,6 +737,10 @@ class Builder(gtk.Window): | |||
738 | self.configuration.update(params) | 737 | self.configuration.update(params) |
739 | self.parameters.update(params) | 738 | self.parameters.update(params) |
740 | 739 | ||
740 | def set_base_image(self): | ||
741 | self.configuration.initial_selected_image = self.configuration.selected_image | ||
742 | self.hob_image = self.configuration.selected_image + "-edited" | ||
743 | |||
741 | def reset(self): | 744 | def reset(self): |
742 | self.configuration.curr_mach = "" | 745 | self.configuration.curr_mach = "" |
743 | self.configuration.clear_selection() | 746 | self.configuration.clear_selection() |
@@ -962,7 +965,7 @@ class Builder(gtk.Window): | |||
962 | if selected_image == self.recipe_model.__custom_image__: | 965 | if selected_image == self.recipe_model.__custom_image__: |
963 | if self.configuration.initial_selected_image != selected_image: | 966 | if self.configuration.initial_selected_image != selected_image: |
964 | version = self.recipe_model.get_custom_image_version() | 967 | version = self.recipe_model.get_custom_image_version() |
965 | linkname = 'hob-image' + version+ "-" + self.configuration.curr_mach | 968 | linkname = self.hob_image + version + "-" + self.configuration.curr_mach |
966 | else: | 969 | else: |
967 | linkname = selected_image + '-' + self.configuration.curr_mach | 970 | linkname = selected_image + '-' + self.configuration.curr_mach |
968 | image_extension = self.get_image_extension() | 971 | image_extension = self.get_image_extension() |