summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-09-06 10:57:28 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-08 00:33:46 +0100
commit1937b17f675d25b358d4110d836ad748a11cbfb7 (patch)
tree38bbfdb2d196186e827184c19c8ef3a27c7717f5 /bitbake
parent144e7dbc35e420ed5b591fbdb705bcc73d3634e1 (diff)
downloadpoky-1937b17f675d25b358d4110d836ad748a11cbfb7.tar.gz
bitbake: fetch2/npm: explicitly specify workdir
We were downloading into the current directory here, which is fine if that current directory can be expected to be the right place - but that's not true when called from recipetool within OE. We should explicitly specify the directory to run the command in and then there won't be a problem. (Bitbake rev: 0ddaf725e5a0675b252b7f80b1706370e478175b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/npm.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py
index b26ac22eff..65ccb0dd2e 100644
--- a/bitbake/lib/bb/fetch2/npm.py
+++ b/bitbake/lib/bb/fetch2/npm.py
@@ -102,7 +102,8 @@ class Npm(FetchMethod):
102 def _runwget(self, ud, d, command, quiet): 102 def _runwget(self, ud, d, command, quiet):
103 logger.debug(2, "Fetching %s using command '%s'" % (ud.url, command)) 103 logger.debug(2, "Fetching %s using command '%s'" % (ud.url, command))
104 bb.fetch2.check_network_access(d, command) 104 bb.fetch2.check_network_access(d, command)
105 runfetchcmd(command, d, quiet) 105 dldir = d.getVar("DL_DIR", True)
106 runfetchcmd(command, d, quiet, workdir=dldir)
106 107
107 def _unpackdep(self, ud, pkg, data, destdir, dldir, d): 108 def _unpackdep(self, ud, pkg, data, destdir, dldir, d):
108 file = data[pkg]['tgz'] 109 file = data[pkg]['tgz']