From: Ross Burton <ross.burton@intel.com>
Date: Thu, 22 Sep 2016 12:24:30 +0000 (+0100)
Subject: bitbake.conf: add a lazy default for SDKMACHINE
X-Git-Tag: yocto-4.0~19660
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bd507ef36578ba7bee6ef8b3f8f6465afca4e20;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b6a1a68f53e..359f787b29c 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')]}"