diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-25 16:31:45 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-25 17:39:36 +0000 |
| commit | bdc1b214431c9c93a929b547b9a61e7b87fbd366 (patch) | |
| tree | dd0070069e0d4122fe9e57aedbbc1cbbb8aaa33f /meta/conf/machine/include/arm/arch-armv4.inc | |
| parent | 262a69ffd33e9d001a7a15fc73671a015e3b5dd1 (diff) | |
| download | openembedded-core-bdc1b214431c9c93a929b547b9a61e7b87fbd366.tar.gz openembedded-core-bdc1b214431c9c93a929b547b9a61e7b87fbd366.tar.bz2 openembedded-core-bdc1b214431c9c93a929b547b9a61e7b87fbd366.zip | |
conf/machine: Clean up MACHINEOVERRIDES handling
OVERRIDES reads from left to right, least to most specific. We were
appending to MACHINEOVERRIDES when we should have been prepending so
the ordering of qemuall verses qemuxxx was incorrect, as was the x86
override and several of the arm overrides. This patch is a batch cleanup
of the various issues to correct the order from least to most specific.
The include order does matter and we needed to tweak some of that in this
patch too.
[YOCTO #4090]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include/arm/arch-armv4.inc')
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv4.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc index fcd56d72d9..5940467ae5 100644 --- a/meta/conf/machine/include/arm/arch-armv4.inc +++ b/meta/conf/machine/include/arm/arch-armv4.inc @@ -9,7 +9,7 @@ FIX_V4BX_ARMV4 = "${@bb.utils.contains("TUNE_FEATURES", "armv4", "--fix-v4bx", " FIX_V4BX_ARMV5 = "${@bb.utils.contains("TUNE_FEATURES", "armv5", "", "${FIX_V4BX_ARMV4}", d)}" FIX_V4BX = "${@bb.utils.contains("TUNE_FEATURES", "thumb", "", "${FIX_V4BX_ARMV5}", d)}" TARGET_LD_KERNEL_ARCH += "${FIX_V4BX}" -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv4", "armv4:", "" ,d)}" require conf/machine/include/arm/arch-arm.inc require conf/machine/include/arm/feature-arm-thumb.inc |