From c0bdd186090d92dac97d92bceb43a4e8c13203fb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 28 Feb 2014 17:24:24 +0000 Subject: 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 --- bitbake/lib/bb/fetch2/svk.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bitbake/lib') 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): svkcmd = "svk co -r %s %s/%s" % (ud.revision, svkroot, ud.module) # create temp directory - localdata = data.createCopy(d) - data.update_data(localdata) logger.debug(2, "Fetch: creating temporary directory") - bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata)) - data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata) - tmpfile, errors = bb.process.run(data.getVar('MKTEMPDIRCMD', localdata, True) or "false") + bb.utils.mkdirhier(d.expand('${WORKDIR}')) + mktemp = d.getVar("FETCHCMD_svkmktemp", True) or d.expand("mktemp -d -q '${WORKDIR}/oesvk.XXXXXX'") + tmpfile, errors = bb.process.run(mktemp) tmpfile = tmpfile.strip() if not tmpfile: logger.error() -- cgit v1.2.3-54-g00ecf