summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml9
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml18
-rw-r--r--bitbake/lib/bb/fetch2/local.py9
3 files changed, 0 insertions, 36 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
index 3f1d8eb521..d1ce43e23a 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
@@ -268,15 +268,6 @@
268 <link linkend='var-FILESPATH'><filename>FILESPATH</filename></link> 268 <link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>
269 variable is used in the same way 269 variable is used in the same way
270 <filename>PATH</filename> is used to find executables. 270 <filename>PATH</filename> is used to find executables.
271 Failing that,
272 <link linkend='var-FILESDIR'><filename>FILESDIR</filename></link>
273 is used to find the appropriate relative file.
274 <note>
275 <filename>FILESDIR</filename> is deprecated and can
276 be replaced with <filename>FILESPATH</filename>.
277 Because <filename>FILESDIR</filename> is likely to be
278 removed, you should not use this variable in any new code.
279 </note>
280 If the file cannot be found, it is assumed that it is available in 271 If the file cannot be found, it is assumed that it is available in
281 <link linkend='var-DL_DIR'><filename>DL_DIR</filename></link> 272 <link linkend='var-DL_DIR'><filename>DL_DIR</filename></link>
282 by the time the <filename>download()</filename> method is called. 273 by the time the <filename>download()</filename> method is called.
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
index 66d8f844ef..0e89bf2396 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
@@ -1539,24 +1539,6 @@
1539 </glossdef> 1539 </glossdef>
1540 </glossentry> 1540 </glossentry>
1541 1541
1542 <glossentry id='var-FILESDIR'><glossterm>FILESDIR</glossterm>
1543 <glossdef>
1544 <para>
1545 Specifies directories BitBake uses when searching for
1546 patches and files.
1547 The "local" fetcher module uses these directories when
1548 handling <filename>file://</filename> URLs if the file
1549 was not found using
1550 <link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>.
1551 <note>
1552 The <filename>FILESDIR</filename> variable is
1553 deprecated and you should use
1554 <filename>FILESPATH</filename> in all new code.
1555 </note>
1556 </para>
1557 </glossdef>
1558 </glossentry>
1559
1560 <glossentry id='var-FILESPATH'><glossterm>FILESPATH</glossterm> 1542 <glossentry id='var-FILESPATH'><glossterm>FILESPATH</glossterm>
1561 <glossdef> 1543 <glossdef>
1562 <para> 1544 <para>
diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py
index 2ff77234e5..a114ac12e5 100644
--- a/bitbake/lib/bb/fetch2/local.py
+++ b/bitbake/lib/bb/fetch2/local.py
@@ -67,12 +67,6 @@ class Local(FetchMethod):
67 logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":")))) 67 logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":"))))
68 newpath, hist = bb.utils.which(filespath, path, history=True) 68 newpath, hist = bb.utils.which(filespath, path, history=True)
69 searched.extend(hist) 69 searched.extend(hist)
70 if not newpath:
71 filesdir = d.getVar('FILESDIR')
72 if filesdir:
73 logger.debug(2, "Searching for %s in path: %s" % (path, filesdir))
74 newpath = os.path.join(filesdir, path)
75 searched.append(newpath)
76 if (not newpath or not os.path.exists(newpath)) and path.find("*") != -1: 70 if (not newpath or not os.path.exists(newpath)) and path.find("*") != -1:
77 # For expressions using '*', best we can do is take the first directory in FILESPATH that exists 71 # For expressions using '*', best we can do is take the first directory in FILESPATH that exists
78 newpath, hist = bb.utils.which(filespath, ".", history=True) 72 newpath, hist = bb.utils.which(filespath, ".", history=True)
@@ -102,9 +96,6 @@ class Local(FetchMethod):
102 filespath = d.getVar('FILESPATH') 96 filespath = d.getVar('FILESPATH')
103 if filespath: 97 if filespath:
104 locations = filespath.split(":") 98 locations = filespath.split(":")
105 filesdir = d.getVar('FILESDIR')
106 if filesdir:
107 locations.append(filesdir)
108 locations.append(d.getVar("DL_DIR")) 99 locations.append(d.getVar("DL_DIR"))
109 100
110 msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations) 101 msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations)