From 1cf4440aaeb826d4f040f41abeb1514af4a1b8b9 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Mon, 2 Apr 2012 16:29:20 +0800 Subject: Hob: a minor fix on pmake params["pmake"] should be in the format "-j int". When loading/saving "PARALLEL_MAKE" into templates, configuration.pmake will be converted into "-j int", as "PACKAGE_CLASSES" and "BBLAYERS" do. For "PACKAGE_CLASSES" and "BBLAYERS", params["pclass"] and params["layer"] are also strings rather than the types of configuration.curr_package_format and configuration.layers. (Bitbake rev: d49db15badb77855cef855ee73430fcbc16b6916) Signed-off-by: Shane Wang Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 4 ++-- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index abb686eafd..a3410d425d 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -48,7 +48,7 @@ class Configuration: self.dldir = params["dldir"] self.sstatedir = params["sstatedir"] self.sstatemirror = params["sstatemirror"] - self.pmake = params["pmake"] + self.pmake = int(params["pmake"].split()[1]) self.bbthread = params["bbthread"] self.curr_package_format = " ".join(params["pclass"].split("package_")).strip() self.image_rootfs_size = params["image_rootfs_size"] @@ -85,7 +85,7 @@ class Configuration: self.dldir = params["dldir"] self.sstatedir = params["sstatedir"] self.sstatemirror = params["sstatemirror"] - self.pmake = params["pmake"] + self.pmake = int(params["pmake"].split()[1]) self.bbthread = params["bbthread"] self.curr_package_format = " ".join(params["pclass"].split("package_")).strip() self.image_rootfs_size = params["image_rootfs_size"] diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 9d1c7a2532..dc2b1bb4f6 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py @@ -436,7 +436,7 @@ class HobHandler(gobject.GObject): pmake = int(pmake.lstrip("-j ")) except: pmake = num_threads - params["pmake"] = pmake + params["pmake"] = "-j %s" % pmake params["image_addr"] = self.server.runCommand(["getVariable", "DEPLOY_DIR_IMAGE"]) or "" -- cgit v1.2.3-54-g00ecf