Patchwork bitbake.conf: Set a dafault value for TUNE_PKGARCH

login
register
mail settings
Submitter Richard Purdie
Date May 30, 2014, 2:55 p.m.
Message ID <1401461702.31309.51.camel@ted>
Download mbox | patch
Permalink /patch/73013/
State New
Headers show

Comments

Richard Purdie - May 30, 2014, 2:55 p.m.
If we don't do this, we see an exception:

ERROR: Failure expanding variable MACHINE_ARCH, expression was ${@[d.getVar('TUNE_PKGARCH', True),
d.getVar('MACHINE', True)][bool(d.getVar('MACHINE', True))].replace('-', '_')} which triggered
exception AttributeError: 'NoneType' object has no attribute 'replace'

Setting a default value avoids this error and allows the sanity checker
to trigger instead.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 0b9e490..3dc5cb0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -132,6 +132,7 @@  SDK_PACKAGE_ARCHS = "all any noarch ${SDK_ARCH}-${SDKPKGSUFFIX}"
 SDK_LD_ARCH = "${BUILD_LD_ARCH}"
 SDK_AS_ARCH = "${BUILD_AS_ARCH}"
 
+TUNE_PKGARCH ??= ""
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
 MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH', True), d.getVar('MACHINE', True)][bool(d.getVar('MACHINE', True))].replace('-', '_')}"
 PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}"