[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2599/8267] bitbake.conf: add a lazy default for SDKMACHINE



commit 65a7b15b44d4273a560d95ecbfd65cd4265024b3
Author: Ross Burton <ross burton intel com>
Date:   Thu Sep 22 13:24:30 2016 +0100

    bitbake.conf: add a lazy default for SDKMACHINE
    
    If the user doesn't set SDKMACHINE in their local.conf then uninative and
    buildtools will fail in obscure ways, so ensure that a default value is set.
    
    Also as SDK_ARCH will be overritten then loading the machine-sdk configuration
    file, don't bother assigning it.
    
    (From OE-Core rev: 6bd507ef36578ba7bee6ef8b3f8f6465afca4e20)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b6a1a68..359f787 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -129,7 +129,7 @@ TARGET_CC_ARCH = "${TUNE_CCARGS}"
 TARGET_LD_ARCH = "${TUNE_LDARGS}"
 TARGET_AS_ARCH = "${TUNE_ASARGS}"
 
-SDK_ARCH = "${BUILD_ARCH}"
+SDKMACHINE ??= "x86_64"
 SDK_OS = "${BUILD_OS}"
 SDK_VENDOR = "-oesdk"
 SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', True), ''][d.getVar('SDK_OS', True) == ('' 
or 'custom')]}"


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