| Message ID | 1474550474-10525-1-git-send-email-ross.burton@intel.com |
|---|---|
| State | Accepted |
| Commit | 6bd507ef36578ba7bee6ef8b3f8f6465afca4e20 |
| Headers | show |
On Thu, Sep 22, 2016 at 6:21 AM, Ross Burton <ross.burton@intel.com> wrote: > 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. > I think this should also be documented somewhere. > 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> > --- > meta/conf/bitbake.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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')]}" > -- > 2.8.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
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')]}"
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> --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core