summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-22 21:40:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-26 10:01:24 +0000
commit7420cf5d67653e950e484c1dd3c9c3d2f2ff43af (patch)
treede7e998e142f17895b94779b5e0a0ef89ec8c2bd /bitbake/lib/bb
parent13ecfdb3310378a27c863a915a8f7d65f66cb725 (diff)
downloadpoky-7420cf5d67653e950e484c1dd3c9c3d2f2ff43af.tar.gz
bitbake: fetch2/local: Improve handling of wildcard matches
Currently wildcard matches end up working by FILESDIR being defined in the metadata to a default of "." in FILESPATH which is hacky at best. This patch adds the behaviour into the fetcher so its at least slightly more explicit. (Bitbake rev: 07b5f84133ac79aac4e939ea5f24390ad7f940a5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/local.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py
index 690532d63a..7ea2f3b2e4 100644
--- a/bitbake/lib/bb/fetch2/local.py
+++ b/bitbake/lib/bb/fetch2/local.py
@@ -62,7 +62,12 @@ class Local(FetchMethod):
62 if filesdir: 62 if filesdir:
63 logger.debug(2, "Searching for %s in path: %s" % (path, filesdir)) 63 logger.debug(2, "Searching for %s in path: %s" % (path, filesdir))
64 newpath = os.path.join(filesdir, path) 64 newpath = os.path.join(filesdir, path)
65 if not os.path.exists(newpath) and path.find("*") == -1: 65 if not newpath or not os.path.exists(newpath) and path.find("*") != -1:
66 # For expressions using '*', best we can do is take the first directory in FILESPATH that exists
67 newpath = bb.utils.which(filespath, ".")
68 logger.debug(2, "Searching for %s in path: %s" % (path, newpath))
69 return newpath
70 if not os.path.exists(newpath):
66 dldirfile = os.path.join(d.getVar("DL_DIR", True), path) 71 dldirfile = os.path.join(d.getVar("DL_DIR", True), path)
67 logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path)) 72 logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path))
68 bb.utils.mkdirhier(os.path.dirname(dldirfile)) 73 bb.utils.mkdirhier(os.path.dirname(dldirfile))