From bf422fcfff1e5e1b635782ae3c896c9318190159 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 10 Feb 2010 14:27:21 +0000 Subject: qemux86: fix setting of preferred provider for virtual/xserver Change the virtual/xserver preferred provider in qemu.inc to a soft assign and set preferred provider in qemux86 before the require so that the value is retained. Signed-off-by: Joshua Lock --- meta/conf/machine/qemux86.conf | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'meta/conf/machine/qemux86.conf') diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index d5c5ff9ec6..7f982b2ce6 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -5,6 +5,13 @@ TARGET_ARCH = "i586" PACKAGE_EXTRA_ARCHS = "x86" +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" + require conf/machine/include/qemu.inc MACHINE_FEATURES += "x86" @@ -13,12 +20,6 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" # We bypass swrast but we need it to be present for X to load correctly XSERVER ?= "xserver-xf86-dri-lite \ mesa-dri-driver-swrast \ -- cgit v1.2.3-54-g00ecf