diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-19 13:31:22 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 09:31:41 +0100 |
| commit | 6ab380ddde11a8695ae50efb3710c72fb8a772ba (patch) | |
| tree | 61e184eca5ebc97db2b7c23a801af27df7a6f649 /meta/conf | |
| parent | f4786027baf410ae6d8c513826c633602fee4ec2 (diff) | |
| download | poky-6ab380ddde11a8695ae50efb3710c72fb8a772ba.tar.gz | |
bitbake.conf: Set PACKAGE_ARCH with ??=
Currently its near impossible for other classes to sanely override
this value with their own default. By setting a weak default we can
allow other classes to change the default and allow end recipes to
again override this.
As far as I can tell, there shouldn't be any regressions from this
change.
(From OE-Core rev: 12b2a73d336d66596939eae5c9947d4054c0316e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | 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 afe86612b4..721ea101ee 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -133,7 +133,7 @@ SDK_LD_ARCH = "${BUILD_LD_ARCH}" | |||
| 133 | SDK_AS_ARCH = "${BUILD_AS_ARCH}" | 133 | SDK_AS_ARCH = "${BUILD_AS_ARCH}" |
| 134 | 134 | ||
| 135 | TUNE_PKGARCH ??= "" | 135 | TUNE_PKGARCH ??= "" |
| 136 | PACKAGE_ARCH = "${TUNE_PKGARCH}" | 136 | PACKAGE_ARCH ??= "${TUNE_PKGARCH}" |
| 137 | MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH', True), d.getVar('MACHINE', True)][bool(d.getVar('MACHINE', True))].replace('-', '_')}" | 137 | MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH', True), d.getVar('MACHINE', True)][bool(d.getVar('MACHINE', True))].replace('-', '_')}" |
| 138 | PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}" | 138 | PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}" |
| 139 | PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" | 139 | PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" |