[bitbake-devel] [PATCH] fetch2/local: Improve handling of wildcard matches
Richard Purdie
richard.purdie at linuxfoundation.org
Thu Nov 22 21:40:18 UTC 2012
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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))
More information about the bitbake-devel
mailing list