diff options
author | Shane Wang <shane.wang@intel.com> | 2012-04-02 16:29:20 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-05 18:48:08 +0100 |
commit | 1cf4440aaeb826d4f040f41abeb1514af4a1b8b9 (patch) | |
tree | 0398d56ba4dcbc9aeb747cb8a68abbd41dafa33e /bitbake/lib | |
parent | 3d9f67c2d676fd283078fb50127369768b072793 (diff) | |
download | poky-1cf4440aaeb826d4f040f41abeb1514af4a1b8b9.tar.gz |
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 <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 4 | ||||
-rw-r--r-- | 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: | |||
48 | self.dldir = params["dldir"] | 48 | self.dldir = params["dldir"] |
49 | self.sstatedir = params["sstatedir"] | 49 | self.sstatedir = params["sstatedir"] |
50 | self.sstatemirror = params["sstatemirror"] | 50 | self.sstatemirror = params["sstatemirror"] |
51 | self.pmake = params["pmake"] | 51 | self.pmake = int(params["pmake"].split()[1]) |
52 | self.bbthread = params["bbthread"] | 52 | self.bbthread = params["bbthread"] |
53 | self.curr_package_format = " ".join(params["pclass"].split("package_")).strip() | 53 | self.curr_package_format = " ".join(params["pclass"].split("package_")).strip() |
54 | self.image_rootfs_size = params["image_rootfs_size"] | 54 | self.image_rootfs_size = params["image_rootfs_size"] |
@@ -85,7 +85,7 @@ class Configuration: | |||
85 | self.dldir = params["dldir"] | 85 | self.dldir = params["dldir"] |
86 | self.sstatedir = params["sstatedir"] | 86 | self.sstatedir = params["sstatedir"] |
87 | self.sstatemirror = params["sstatemirror"] | 87 | self.sstatemirror = params["sstatemirror"] |
88 | self.pmake = params["pmake"] | 88 | self.pmake = int(params["pmake"].split()[1]) |
89 | self.bbthread = params["bbthread"] | 89 | self.bbthread = params["bbthread"] |
90 | self.curr_package_format = " ".join(params["pclass"].split("package_")).strip() | 90 | self.curr_package_format = " ".join(params["pclass"].split("package_")).strip() |
91 | self.image_rootfs_size = params["image_rootfs_size"] | 91 | 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): | |||
436 | pmake = int(pmake.lstrip("-j ")) | 436 | pmake = int(pmake.lstrip("-j ")) |
437 | except: | 437 | except: |
438 | pmake = num_threads | 438 | pmake = num_threads |
439 | params["pmake"] = pmake | 439 | params["pmake"] = "-j %s" % pmake |
440 | 440 | ||
441 | params["image_addr"] = self.server.runCommand(["getVariable", "DEPLOY_DIR_IMAGE"]) or "" | 441 | params["image_addr"] = self.server.runCommand(["getVariable", "DEPLOY_DIR_IMAGE"]) or "" |
442 | 442 | ||