[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8226/8267] runqemu: Improve relative path handling in qemuconf files



commit 968145b24e3cef6fe047e89e5542d8c231eb7f52
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Nov 21 11:37:39 2017 +0000

    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>

 scripts/runqemu |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 6ea370d..ef6d5f0 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -726,6 +726,8 @@ class BaseConfig(object):
         cf.read(self.qemuboot)
         for k, v in cf.items('config_bsp'):
             k_upper = k.upper()
+            if v.startswith("../"):
+                v = os.path.abspath(os.path.dirname(self.qemuboot) + "/" + v)
             self.set(k_upper, v)
 
     def validate_paths(self):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]