aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2013-07-15 15:10:27 -0500
committerSaul Wold <sgw@linux.intel.com>2013-07-18 07:14:40 -0700
commit95f6e9a3d8fa24acc3bab392719e2d92be25d806 (patch)
tree48da5d5d9ea686f839a7d97e042027f965948445
parentc126729b29822d3602c9c4fd9016cc79b6057fc5 (diff)
downloadopenembedded-core-contrib-95f6e9a3d8fa24acc3bab392719e2d92be25d806.tar.gz
terminal.bbclass: Fix BB_RUNFMT processing
BB_RUNFMT can include task and taskfunc, as well as func and pid. Add the two missing items toe the runfmt processing. Also BB_RUNFMT can include arbitrary directory structure. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/classes/terminal.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index ae338e9f57..591b4acf6d 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -18,8 +18,10 @@ def emit_terminal_func(command, envdata, d):
envdata.setVarFlag(cmd_func, 'func', 1)
runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}"
- runfile = runfmt.format(func=cmd_func, pid=os.getpid())
+ runfile = runfmt.format(func=cmd_func, task=cmd_func, taskfunc=cmd_func, pid=os.getpid())
runfile = os.path.join(d.getVar('T', True), runfile)
+ bb.mkdirhier(os.path.dirname(runfile))
+
with open(runfile, 'w') as script:
script.write('#!/bin/sh -e\n')
bb.data.emit_func(cmd_func, script, envdata)