summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-21 11:37:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-04 17:23:59 +0000
commit968145b24e3cef6fe047e89e5542d8c231eb7f52 (patch)
treec7be90bb573e3e2fddcee0a6200d9e50cc19ead2 /scripts
parent3c28d31fed03473dbb4b2a048e9afb09001e9389 (diff)
downloadpoky-968145b24e3cef6fe047e89e5542d8c231eb7f52.tar.gz
runqemu: Improve relative path handling in qemuconf files
If a variable starts with "../", its likely its a path and we want to set it to an absolute path relative to the qemuconf file. This means we don't have to use bitbake as often to figure out variables. (From OE-Core rev: 61c449857f056d7c6c29530aa11bf8353b113638) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit dfc7940900d798aa47716288338107e1d46a3972) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 6ea370d874..ef6d5f0012 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -726,6 +726,8 @@ class BaseConfig(object):
726 cf.read(self.qemuboot) 726 cf.read(self.qemuboot)
727 for k, v in cf.items('config_bsp'): 727 for k, v in cf.items('config_bsp'):
728 k_upper = k.upper() 728 k_upper = k.upper()
729 if v.startswith("../"):
730 v = os.path.abspath(os.path.dirname(self.qemuboot) + "/" + v)
729 self.set(k_upper, v) 731 self.set(k_upper, v)
730 732
731 def validate_paths(self): 733 def validate_paths(self):