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/imageconfigurationpage.py | |
parent | 7dd4bf6310c61828dc2ac7777f5adf1004349715 (diff) | |
download | openembedded-core-contrib-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/imageconfigurationpage.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index c4fd3f746c..2766bea8c7 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -459,6 +459,7 @@ class ImageConfigurationPage (HobPage): for i in self.builder.parameters.image_black_pattern.split(): black_pattern.append(re.compile(i)) black_pattern.append(re.compile("hob-image")) + black_pattern.append(re.compile("edited(-[0-9]*)*.bb$")) it = image_model.get_iter_first() self._image_combo_disconnect_signal() @@ -545,7 +546,7 @@ class ImageConfigurationPage (HobPage): self.builder.just_bake() def edit_image_button_clicked_cb(self, button): - self.builder.configuration.initial_selected_image = self.builder.configuration.selected_image + self.builder.set_base_image() self.builder.show_recipes() def my_images_button_clicked_cb(self, button): |