From 88fa952b7c36c1d3375d0b1cbd9879f61def5b25 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 25 Mar 2013 16:31:45 +0000 Subject: 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 --- meta/conf/machine/qemux86-64.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/conf/machine/qemux86-64.conf') 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" -- cgit 1.2.3-korg