[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2712/8267] populate_sdk_base.bbclass: fix broken variables



commit 93d4250c2b2b2b200579d9b81a56c3dac467b10d
Author: Ioan-Adrian Ratiu <adrian ratiu ni com>
Date:   Tue Sep 27 17:40:11 2016 +0300

    populate_sdk_base.bbclass: fix broken variables
    
    This function never worked because the SDK_OUTPUT and SDKPATH vars are
    written bash-style in a python function. The only reason it never failed
    a build is because the function bails out the start because of the flag
    CHECK_SDK_SYSROOTS.
    
    And I guess nobody tested with CHECK_SDK_SYSROOTS enabled until now.
    
    (From OE-Core rev: 9f60dfdaaa74b90ebcfcdd9f3817c62a56243e92)
    
    Signed-off-by: Ioan-Adrian Ratiu <adrian ratiu ni com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/populate_sdk_base.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index ce12f27..a23775e 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -147,7 +147,8 @@ python check_sdk_sysroots() {
         return os.path.abspath(path)
 
     # Get scan root
-    SCAN_ROOT = norm_path("${SDK_OUTPUT}/${SDKPATH}/sysroots/")
+    SCAN_ROOT = norm_path("%s/%s/sysroots/" % (d.getVar('SDK_OUTPUT', True),
+                                               d.getVar('SDKPATH', True)))
 
     bb.note('Checking SDK sysroots at ' + SCAN_ROOT)
 


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