bitbake: 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. (Bitbake rev: 751c9dc51fd01fa64a1ff37ba2638110335f71af) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
2d704e445c
commit
2334036502
|
@ -268,15 +268,6 @@
|
||||||
<link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>
|
<link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>
|
||||||
variable is used in the same way
|
variable is used in the same way
|
||||||
<filename>PATH</filename> is used to find executables.
|
<filename>PATH</filename> is used to find executables.
|
||||||
Failing that,
|
|
||||||
<link linkend='var-FILESDIR'><filename>FILESDIR</filename></link>
|
|
||||||
is used to find the appropriate relative file.
|
|
||||||
<note>
|
|
||||||
<filename>FILESDIR</filename> is deprecated and can
|
|
||||||
be replaced with <filename>FILESPATH</filename>.
|
|
||||||
Because <filename>FILESDIR</filename> is likely to be
|
|
||||||
removed, you should not use this variable in any new code.
|
|
||||||
</note>
|
|
||||||
If the file cannot be found, it is assumed that it is available in
|
If the file cannot be found, it is assumed that it is available in
|
||||||
<link linkend='var-DL_DIR'><filename>DL_DIR</filename></link>
|
<link linkend='var-DL_DIR'><filename>DL_DIR</filename></link>
|
||||||
by the time the <filename>download()</filename> method is called.
|
by the time the <filename>download()</filename> method is called.
|
||||||
|
|
|
@ -1539,24 +1539,6 @@
|
||||||
</glossdef>
|
</glossdef>
|
||||||
</glossentry>
|
</glossentry>
|
||||||
|
|
||||||
<glossentry id='var-FILESDIR'><glossterm>FILESDIR</glossterm>
|
|
||||||
<glossdef>
|
|
||||||
<para>
|
|
||||||
Specifies directories BitBake uses when searching for
|
|
||||||
patches and files.
|
|
||||||
The "local" fetcher module uses these directories when
|
|
||||||
handling <filename>file://</filename> URLs if the file
|
|
||||||
was not found using
|
|
||||||
<link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>.
|
|
||||||
<note>
|
|
||||||
The <filename>FILESDIR</filename> variable is
|
|
||||||
deprecated and you should use
|
|
||||||
<filename>FILESPATH</filename> in all new code.
|
|
||||||
</note>
|
|
||||||
</para>
|
|
||||||
</glossdef>
|
|
||||||
</glossentry>
|
|
||||||
|
|
||||||
<glossentry id='var-FILESPATH'><glossterm>FILESPATH</glossterm>
|
<glossentry id='var-FILESPATH'><glossterm>FILESPATH</glossterm>
|
||||||
<glossdef>
|
<glossdef>
|
||||||
<para>
|
<para>
|
||||||
|
|
|
@ -67,12 +67,6 @@ class Local(FetchMethod):
|
||||||
logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":"))))
|
logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":"))))
|
||||||
newpath, hist = bb.utils.which(filespath, path, history=True)
|
newpath, hist = bb.utils.which(filespath, path, history=True)
|
||||||
searched.extend(hist)
|
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:
|
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
|
# For expressions using '*', best we can do is take the first directory in FILESPATH that exists
|
||||||
newpath, hist = bb.utils.which(filespath, ".", history=True)
|
newpath, hist = bb.utils.which(filespath, ".", history=True)
|
||||||
|
@ -102,9 +96,6 @@ class Local(FetchMethod):
|
||||||
filespath = d.getVar('FILESPATH')
|
filespath = d.getVar('FILESPATH')
|
||||||
if filespath:
|
if filespath:
|
||||||
locations = filespath.split(":")
|
locations = filespath.split(":")
|
||||||
filesdir = d.getVar('FILESDIR')
|
|
||||||
if filesdir:
|
|
||||||
locations.append(filesdir)
|
|
||||||
locations.append(d.getVar("DL_DIR"))
|
locations.append(d.getVar("DL_DIR"))
|
||||||
|
|
||||||
msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations)
|
msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations)
|
||||||
|
|
Loading…
Reference in New Issue