aboutsummaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86-64.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-25 16:31:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-25 17:42:58 +0000
commit88fa952b7c36c1d3375d0b1cbd9879f61def5b25 (patch)
treeb652a35a16418a397234fafda30c5947e6ad2ad9 /meta/conf/machine/qemux86-64.conf
parent7a8f3f7a012fd323df8d812d969d4190d956a82e (diff)
downloadopenembedded-core-contrib-88fa952b7c36c1d3375d0b1cbd9879f61def5b25.tar.gz
openembedded-core-contrib-88fa952b7c36c1d3375d0b1cbd9879f61def5b25.tar.bz2
openembedded-core-contrib-88fa952b7c36c1d3375d0b1cbd9879f61def5b25.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] (From OE-Core rev: bdc1b214431c9c93a929b547b9a61e7b87fbd366) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/qemux86-64.conf')
-rw-r--r--meta/conf/machine/qemux86-64.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 23a710848e..90007fb26e 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+require conf/machine/include/qemu.inc
require conf/machine/include/tune-x86_64.inc
KERNEL_IMAGETYPE = "bzImage"
@@ -20,8 +21,6 @@ XSERVER ?= "xserver-xorg \
xf86-input-evdev \
xf86-video-vmware"
-require conf/machine/include/qemu.inc
-
MACHINE_FEATURES += "x86"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"