* [PATCH 1/3] ui/crumbs/hobprefs: re-enable reloading of data after prefs changes
2011-09-19 22:41 [PATCH 0/3] Various hob fixes Joshua Lock
@ 2011-09-19 22:41 ` Joshua Lock
2011-09-19 22:41 ` [PATCH 2/3] hob: fix build again when building packages only Joshua Lock
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Joshua Lock @ 2011-09-19 22:41 UTC (permalink / raw)
To: openembedded-core
When disabling the toolchain w/ headers checkbox in an early commit I
accidentally disabled too much code. This re-enables adding the custom
response handler to the Preferences dialog which triggeres a reparse of
the metadata when appropriate preference changes are made.
Fixes [YOCTO #1479]
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
lib/bb/ui/crumbs/hobprefs.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/bb/ui/crumbs/hobprefs.py b/lib/bb/ui/crumbs/hobprefs.py
index 8d148cd..5dfb0e6 100644
--- a/lib/bb/ui/crumbs/hobprefs.py
+++ b/lib/bb/ui/crumbs/hobprefs.py
@@ -331,4 +331,4 @@ class HobPrefs(gtk.Dialog):
# headerscheck.set_active(self.build_toolchain_headers)
# headerscheck.connect("toggled", self.toggle_headers_cb)
# hbox.pack_start(headerscheck, expand=False, fill=False, padding=6)
- # self.connect("response", self.prefs_response_cb)
+ self.connect("response", self.prefs_response_cb)
--
1.7.6.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] hob: fix build again when building packages only
2011-09-19 22:41 [PATCH 0/3] Various hob fixes Joshua Lock
2011-09-19 22:41 ` [PATCH 1/3] ui/crumbs/hobprefs: re-enable reloading of data after prefs changes Joshua Lock
@ 2011-09-19 22:41 ` Joshua Lock
2011-09-19 22:41 ` [PATCH 3/3] hob: enable package only builds even if an image has been built Joshua Lock
2011-09-20 15:00 ` [PATCH 0/3] Various hob fixes Joshua Lock
3 siblings, 0 replies; 5+ messages in thread
From: Joshua Lock @ 2011-09-19 22:41 UTC (permalink / raw)
To: openembedded-core
The different code paths for package vs image builds have lead to some bit
rot in the package only build and an incompatability between package only
builds and the build again mechanism.
This patch unifies the code paths and fixes build again for package only
builds.
Fixes [YOCTO #1480]
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
lib/bb/ui/crumbs/hobeventhandler.py | 13 +++++--------
lib/bb/ui/hob.py | 11 +++++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/bb/ui/crumbs/hobeventhandler.py b/lib/bb/ui/crumbs/hobeventhandler.py
index 8bf599f..393b407 100644
--- a/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/lib/bb/ui/crumbs/hobeventhandler.py
@@ -71,7 +71,7 @@ class HobHandler(gobject.GObject):
gobject.GObject.__init__(self)
self.current_command = None
- self.building = None
+ self.building = False
self.build_toolchain = False
self.build_toolchain_headers = False
self.generating = False
@@ -128,10 +128,10 @@ class HobHandler(gobject.GObject):
self.server.runCommand(["resetCooker"])
self.server.runCommand(["reparseFiles"])
elif self.current_command == self.BUILD_IMAGE:
- self.building = "image"
if self.generating:
self.emit("data-generated")
self.generating = False
+ self.building = True
self.server.runCommand(["buildTargets", self.build_queue, "build"])
self.build_queue = []
self.current_command = None
@@ -247,11 +247,12 @@ class HobHandler(gobject.GObject):
pmake = "-j %s" % threads
self.server.runCommand(["setVariable", "BB_NUMBER_THREADS", pmake])
- def build_image(self, image, configurator):
+ def build_targets(self, tgts, configurator, build_type="image"):
+ self.build_type = build_type
targets = []
nbbp = None
nbbf = None
- targets.append(image)
+ targets.extend(tgts)
if self.build_toolchain and self.build_toolchain_headers:
targets.append("meta-toolchain-sdk")
elif self.build_toolchain:
@@ -284,10 +285,6 @@ class HobHandler(gobject.GObject):
self.current_command = self.REPARSE_FILES
self.run_next_command()
- def build_packages(self, pkgs):
- self.building = "packages"
- self.server.runCommand(["buildTargets", pkgs, "build"])
-
def cancel_build(self, force=False):
if force:
# Force the cooker to stop as quickly as possible
diff --git a/lib/bb/ui/hob.py b/lib/bb/ui/hob.py
index 51a995e..0f738ce 100644
--- a/lib/bb/ui/hob.py
+++ b/lib/bb/ui/hob.py
@@ -459,6 +459,9 @@ class MainWindow (gtk.Window):
image_name = recipepath.rstrip(".bb")
path, sep, image_name = image_name.rpartition("/")
+ image = []
+ image.append(image_name)
+
rep.writeRecipe(recipepath, self.model)
# In the case where we saved the file for the purpose of building
# it we should then delete it so that the users workspace doesn't
@@ -466,9 +469,9 @@ class MainWindow (gtk.Window):
if not self.save_path:
self.files_to_clean.append(recipepath)
- self.handler.build_image(image_name, self.configurator)
+ self.handler.build_targets(image, self.configurator)
else:
- self.handler.build_packages(self.model.get_selected_pn())
+ self.handler.build_targets(self.model.get_selected_pn(), self.configurator, "packages")
# Disable parts of the menu which shouldn't be used whilst building
self.set_menus_sensitive(False)
@@ -490,7 +493,7 @@ class MainWindow (gtk.Window):
def build_complete_cb(self, running_build):
# Have the handler process BB events again
- self.handler.building = None
+ self.handler.building = False
self.stopping = False
self.back.connect("clicked", self.back_button_clicked_cb)
self.back.set_sensitive(True)
@@ -504,7 +507,7 @@ class MainWindow (gtk.Window):
self.files_to_clean = []
lbl = "<b>Build completed</b>\n\nClick 'Edit Image' to start another build or 'View Messages' to view the messages output during the build."
- if self.handler.building == "image" and self.build_succeeded:
+ if self.handler.build_type == "image" and self.build_succeeded:
deploy = self.handler.get_image_deploy_dir()
lbl = lbl + "\n<a href=\"file://%s\" title=\"%s\">Browse folder of built images</a>." % (deploy, deploy)
--
1.7.6.2
^ permalink raw reply related [flat|nested] 5+ messages in thread