aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bb/fetch2/local.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-05 09:37:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-05 09:38:01 +0100
commit751c9dc51fd01fa64a1ff37ba2638110335f71af (patch)
tree479f174d7d24a80132f55ec53c76d03d1d735c18 /lib/bb/fetch2/local.py
parentc1780bc1872bb35bc28c76eff9110717f02d9db2 (diff)
downloadbitbake-751c9dc51fd01fa64a1ff37ba2638110335f71af.tar.gz
fetch/local: Drop FILESDIR
This has long since been deprecated and is no longer used anywhere, FILESPATH is the commonly used varaible which offers much more flexibility. Remove the FILESDIR code and references from bitbake. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2/local.py')
-rw-r--r--lib/bb/fetch2/local.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py
index 2ff77234e..a114ac12e 100644
--- a/lib/bb/fetch2/local.py
+++ b/lib/bb/fetch2/local.py
@@ -67,12 +67,6 @@ class Local(FetchMethod):
logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":"))))
newpath, hist = bb.utils.which(filespath, path, history=True)
searched.extend(hist)
- if not newpath:
- filesdir = d.getVar('FILESDIR')
- if filesdir:
- logger.debug(2, "Searching for %s in path: %s" % (path, filesdir))
- newpath = os.path.join(filesdir, path)
- searched.append(newpath)
if (not newpath or not os.path.exists(newpath)) and path.find("*") != -1:
# For expressions using '*', best we can do is take the first directory in FILESPATH that exists
newpath, hist = bb.utils.which(filespath, ".", history=True)
@@ -102,9 +96,6 @@ class Local(FetchMethod):
filespath = d.getVar('FILESPATH')
if filespath:
locations = filespath.split(":")
- filesdir = d.getVar('FILESDIR')
- if filesdir:
- locations.append(filesdir)
locations.append(d.getVar("DL_DIR"))
msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations)