From c884b52dd0b790d6e3686be4260a3cceff8846bd Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 20 Jul 2011 15:35:29 -0700 Subject: ui/hob: enable building an image with minimal contents This patch enables a user to build a rootfs containing only the selected packages without having to have first selected a 'Base image'. Fixes [YOCTO #1239] (Bitbake rev: 05c82da31a69c910e72b58b07afcd9fca8c55479) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/hob.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'bitbake/lib/bb/ui/hob.py') diff --git a/bitbake/lib/bb/ui/hob.py b/bitbake/lib/bb/ui/hob.py index 865933c95a..d3442c518c 100644 --- a/bitbake/lib/bb/ui/hob.py +++ b/bitbake/lib/bb/ui/hob.py @@ -369,20 +369,31 @@ class MainWindow (gtk.Window): self.dirty = False def bake_clicked_cb(self, button): + build_image = True + rep = self.model.get_build_rep() if not rep.base_image: - lbl = "Build only packages?\n\nAn image has not been selected, so only the selected packages will be built." + lbl = "Build empty image or only packages?\nA base image" + lbl = lbl + " has not been selected.\n\'Empty image' will build" + lbl = lbl + " an image with only the selected packages as its" + lbl = lbl + " contents.\n'Packages Only' will build only the" + lbl = lbl + " selected packages, no image will be created" dialog = CrumbsDialog(self, lbl, gtk.STOCK_DIALOG_WARNING) dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL) - dialog.add_button("Build", gtk.RESPONSE_YES) + dialog.add_button("Empty Image", gtk.RESPONSE_OK) + dialog.add_button("Packages Only", gtk.RESPONSE_YES) response = dialog.run() dialog.destroy() if response == gtk.RESPONSE_CANCEL: return - else: - self.handler.build_packages(rep.allpkgs.split(" ")) - else: + elif response == gtk.RESPONSE_YES: + build_image = False + elif response == gtk.RESPONSE_OK: + rep.base_image = "empty" + + if build_image: import tempfile, datetime + image_name = "hob-%s-variant-%s" % (rep.base_image, datetime.date.today().isoformat()) image_file = "%s.bb" % (image_name) image_dir = os.path.join(tempfile.gettempdir(), 'hob-images') @@ -397,6 +408,8 @@ class MainWindow (gtk.Window): self.files_to_clean.append(recipepath) self.handler.build_image(image_name, image_dir, self.configurator) + else: + self.handler.build_packages(rep.allpkgs.split(" ")) self.nb.set_current_page(1) -- cgit v1.2.3-54-g00ecf