[bitbake-devel] bitbake/cooker: Ensure matchFile returns full pathnames

Submitted by Richard Purdie on May 24, 2012, 10:02 a.m. | Patch ID: 28591


Message ID 1337853722.8248.105.camel@ted
State New
Headers show

Commit Message

Richard Purdie May 24, 2012, 10:02 a.m.
We should always be passing full pathnames around within bitbake. If
a file was referenced as a relative path to the current working
directory, it might not get passed through the abspath call and
hence the cwd would not get added as a prefix.

This change attempts to put everything through abspath and ignores
failures. Any failure cases would mean the file simply wouldn't exist
and then would get covered by the catchall code below.

[YOCTO #1465]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Patch hide | download patch | download mbox

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 8ad4922..e036efb 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -985,9 +985,10 @@  class BBCooker:
         Find the .bb files which match the expression in 'buildfile'.
-        if bf.startswith("/") or bf.startswith("../"):
+        try:
             bf = os.path.abspath(bf)
+        except:
+            pass
         filelist, masked = self.collect_bbfiles()