From 299fbbf31aa99d360a7ca884d1f0e0dff24d8887 Mon Sep 17 00:00:00 2001 From: Marius Avram Date: Tue, 18 Mar 2014 14:17:06 +0200 Subject: 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 /tmp/deploy/images/${MACHINE}/ and the temporary recipes from /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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/ui/crumbs/builder.py') 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): self.handler.connect("package-populated", self.handler_package_populated_cb) self.handler.append_to_bbfiles("${TOPDIR}/recipes/images/custom/*.bb") - self.handler.generate_hob_base_image() self.initiate_new_build_async() signal.signal(signal.SIGINT, self.event_handle_SIGINT) @@ -738,6 +737,10 @@ class Builder(gtk.Window): self.configuration.update(params) self.parameters.update(params) + def set_base_image(self): + self.configuration.initial_selected_image = self.configuration.selected_image + self.hob_image = self.configuration.selected_image + "-edited" + def reset(self): self.configuration.curr_mach = "" self.configuration.clear_selection() @@ -962,7 +965,7 @@ class Builder(gtk.Window): if selected_image == self.recipe_model.__custom_image__: if self.configuration.initial_selected_image != selected_image: version = self.recipe_model.get_custom_image_version() - linkname = 'hob-image' + version+ "-" + self.configuration.curr_mach + linkname = self.hob_image + version + "-" + self.configuration.curr_mach else: linkname = selected_image + '-' + self.configuration.curr_mach image_extension = self.get_image_extension() -- cgit v1.2.3-54-g00ecf