From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 28 Feb 2014 17:24:24 +0000 (+0000)
Subject: bitbake: fetch/svk: Drop usage of old style *COMMAND variable and MKTEMPDIRCMD
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0bdd186090d92dac97d92bceb43a4e8c13203fb;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/bitbake/lib/bb/fetch2/svk.py b/bitbake/lib/bb/fetch2/svk.py
index 23631b43f49..6f70a3be28f 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()