aboutsummaryrefslogtreecommitdiffstats
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
parentc1780bc1872bb35bc28c76eff9110717f02d9db2 (diff)
downloadbitbake-751c9dc51fd01fa64a1ff37ba2638110335f71af.tar.gz
bitbake-751c9dc51fd01fa64a1ff37ba2638110335f71af.tar.bz2
bitbake-751c9dc51fd01fa64a1ff37ba2638110335f71af.zip
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>
-rw-r--r--conf/bitbake.conf1
-rw-r--r--doc/bitbake-user-manual/bitbake-user-manual-fetching.xml9
-rw-r--r--doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml18
-rw-r--r--lib/bb/fetch2/local.py9
4 files changed, 0 insertions, 37 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index deb36aaa1..a460df4eb 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -24,7 +24,6 @@ DEPENDS = ""
DEPLOY_DIR = "${TMPDIR}/deploy"
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
DL_DIR = "${TMPDIR}/downloads"
-FILESDIR = "${@bb.utils.which(d.getVar('FILESPATH', True), '.')}"
FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}"
GITDIR = "${DL_DIR}/git"
diff --git a/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml b/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
index 3f1d8eb52..d1ce43e23 100644
--- a/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
+++ b/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
@@ -268,15 +268,6 @@
<link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>
variable is used in the same way
<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
<link linkend='var-DL_DIR'><filename>DL_DIR</filename></link>
by the time the <filename>download()</filename> method is called.
diff --git a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
index 66d8f844e..0e89bf239 100644
--- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
+++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
@@ -1539,24 +1539,6 @@
</glossdef>
</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>
<glossdef>
<para>
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)