diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-22 21:40:18 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-26 10:01:24 +0000 |
| commit | 7420cf5d67653e950e484c1dd3c9c3d2f2ff43af (patch) | |
| tree | de7e998e142f17895b94779b5e0a0ef89ec8c2bd | |
| parent | 13ecfdb3310378a27c863a915a8f7d65f66cb725 (diff) | |
| download | ast2050-yocto-poky-7420cf5d67653e950e484c1dd3c9c3d2f2ff43af.zip ast2050-yocto-poky-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>
| -rw-r--r-- | bitbake/lib/bb/fetch2/local.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py index 690532d..7ea2f3b 100644 --- a/bitbake/lib/bb/fetch2/local.py +++ b/bitbake/lib/bb/fetch2/local.py @@ -62,7 +62,12 @@ class Local(FetchMethod): if filesdir: logger.debug(2, "Searching for %s in path: %s" % (path, filesdir)) newpath = os.path.join(filesdir, path) - if 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 + newpath = bb.utils.which(filespath, ".") + logger.debug(2, "Searching for %s in path: %s" % (path, newpath)) + return newpath + if not os.path.exists(newpath): dldirfile = os.path.join(d.getVar("DL_DIR", True), path) logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path)) bb.utils.mkdirhier(os.path.dirname(dldirfile)) |
