mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
bitbake/cooker: Ensure matchFile returns full pathnames
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 adds a second pass at ensuring we only return absolute paths. (Bitbake rev: 72fc62ca124a24e2dbe404a3c83a49608a7c7931) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -985,12 +985,12 @@ class BBCooker:
|
|||||||
"""
|
"""
|
||||||
Find the .bb files which match the expression in 'buildfile'.
|
Find the .bb files which match the expression in 'buildfile'.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if bf.startswith("/") or bf.startswith("../"):
|
if bf.startswith("/") or bf.startswith("../"):
|
||||||
bf = os.path.abspath(bf)
|
bf = os.path.abspath(bf)
|
||||||
filelist, masked = self.collect_bbfiles()
|
filelist, masked = self.collect_bbfiles()
|
||||||
try:
|
try:
|
||||||
os.stat(bf)
|
os.stat(bf)
|
||||||
|
bf = os.path.abspath(bf)
|
||||||
return [bf]
|
return [bf]
|
||||||
except OSError:
|
except OSError:
|
||||||
regexp = re.compile(bf)
|
regexp = re.compile(bf)
|
||||||
|
|||||||
Reference in New Issue
Block a user