From e9a5de67e7822dbb40edf248fbbcc1ec496b0cb0 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Sat, 24 Mar 2012 19:44:11 +0800 Subject: [PATCH] Hob: Avoid getting TMPDIR in hardcode We should get TMPDIR from bitbake server instead of hardcode. (Bitbake rev: 91bdd43468448385e07a57ac54ce25db9a8edf03) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 3 ++- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 2984490a76..7b6c116ee4 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -138,6 +138,7 @@ class Parameters: self.runnable_image_types = params["runnable_image_types"].split() self.runnable_machine_patterns = params["runnable_machine_patterns"].split() self.deployable_image_types = params["deployable_image_types"].split() + self.tmpdir = params["tmpdir"] class Builder(gtk.Window): @@ -813,7 +814,7 @@ class Builder(gtk.Window): if response == gtk.RESPONSE_YES: source_env_path = os.path.join(self.parameters.core_base, "oe-init-build-env") - tmp_path = os.path.join(os.getcwd(), "tmp") + tmp_path = self.parameters.tmpdir if os.path.exists(image_path) and os.path.exists(kernel_path) \ and os.path.exists(source_env_path) and os.path.exists(tmp_path): cmdline = "/usr/bin/xterm -e " diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index e34281113c..8042fbdf59 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py @@ -439,4 +439,5 @@ class HobHandler(gobject.GObject): params["runnable_image_types"] = self.server.runCommand(["getVariable", "RUNNABLE_IMAGE_TYPES"]) or "" params["runnable_machine_patterns"] = self.server.runCommand(["getVariable", "RUNNABLE_MACHINE_PATTERNS"]) or "" params["deployable_image_types"] = self.server.runCommand(["getVariable", "DEPLOYABLE_IMAGE_TYPES"]) or "" + params["tmpdir"] = self.server.runCommand(["getVariable", "TMPDIR"]) or "" return params