diff options
author | Chris Larson <clarson@kergoth.com> | 2003-06-26 03:38:49 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2003-06-26 03:38:49 +0000 |
commit | 151a67dc816f9d85c7313c07ab1efe2fecbf68a1 (patch) | |
tree | 3f398dd4402be00973316af0e0a6684afebbed27 /bin/oe/build.py | |
parent | 17c1d274210dbb1b598a9f9a59710e8567e1d2f6 (diff) | |
download | bitbake-contrib-151a67dc816f9d85c7313c07ab1efe2fecbf68a1.tar.gz |
BUGFIX: call data.expand on the vars we pull from the data store.
Diffstat (limited to 'bin/oe/build.py')
-rw-r--r-- | bin/oe/build.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/oe/build.py b/bin/oe/build.py index ac0caca54..62b7bf287 100644 --- a/bin/oe/build.py +++ b/bin/oe/build.py @@ -114,6 +114,7 @@ def exec_func_shell(func, d): t = data.getVar('T', d) if not t: return 0 + t = data.expand(t, d) mkdirhier(t) logfile = "%s/log.%s.%s" % (t, func, str(os.getpid())) runfile = "%s/run.%s.%s" % (t, func, str(os.getpid())) @@ -123,6 +124,7 @@ def exec_func_shell(func, d): if data.getVar("OEDEBUG", d): f.write("set -x\n") oepath = data.getVar("OEPATH", d) if oepath: + oepath = data.expand(oepath, d) for s in data.expand(oepath, d).split(":"): f.write("if test -f %s/build/oebuild.sh; then source %s/build/oebuild.sh; fi\n" % (s,s)); data.emit_env(f, d) @@ -156,7 +158,6 @@ def exec_task(task, d): # check if the task is in the graph.. if not _task_graph.hasnode(task): raise EventException("", InvalidTask(task, d)) -# return 0 # check whether this task needs executing.. @@ -193,7 +194,7 @@ def mkstamp(task, d): stamp = data.getVar('STAMP', d) if not stamp: return - stamp = "%s.%s" % (stamp, task) + stamp = "%s.%s" % (data.expand(stamp, d), task) open(stamp, "w+") |