summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-28 17:24:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-02 17:25:29 +0000
commitc0bdd186090d92dac97d92bceb43a4e8c13203fb (patch)
tree3b2b7c393919c8d5fa7c117661ed559c8d9926e7 /bitbake
parentc547149cae38a6e45255b6be74d8ea2dc8a8b1bd (diff)
downloadpoky-c0bdd186090d92dac97d92bceb43a4e8c13203fb.tar.gz
bitbake: fetch/svk: Drop usage of old style *COMMAND variable and MKTEMPDIRCMD
Clean up some horrible old code and drop usage of the old style *COMMAND variable and MKTEMPDIRCMD whilst in here. This means we don't need to touch OVERRIDES either. (Bitbake rev: c127bb3a9b7b1d2ab2c833ff73186b6ead0dc29c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/svk.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/svk.py b/bitbake/lib/bb/fetch2/svk.py
index 23631b43f4..6f70a3be28 100644
--- a/bitbake/lib/bb/fetch2/svk.py
+++ b/bitbake/lib/bb/fetch2/svk.py
@@ -72,12 +72,10 @@ class Svk(FetchMethod):
72 svkcmd = "svk co -r %s %s/%s" % (ud.revision, svkroot, ud.module) 72 svkcmd = "svk co -r %s %s/%s" % (ud.revision, svkroot, ud.module)
73 73
74 # create temp directory 74 # create temp directory
75 localdata = data.createCopy(d)
76 data.update_data(localdata)
77 logger.debug(2, "Fetch: creating temporary directory") 75 logger.debug(2, "Fetch: creating temporary directory")
78 bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata)) 76 bb.utils.mkdirhier(d.expand('${WORKDIR}'))
79 data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata) 77 mktemp = d.getVar("FETCHCMD_svkmktemp", True) or d.expand("mktemp -d -q '${WORKDIR}/oesvk.XXXXXX'")
80 tmpfile, errors = bb.process.run(data.getVar('MKTEMPDIRCMD', localdata, True) or "false") 78 tmpfile, errors = bb.process.run(mktemp)
81 tmpfile = tmpfile.strip() 79 tmpfile = tmpfile.strip()
82 if not tmpfile: 80 if not tmpfile:
83 logger.error() 81 logger.error()