sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 <josh@linux.intel.com>
This commit is contained in:
Joshua Lock 2010-02-10 14:27:21 +00:00
parent 62ab7dac39
commit bf422fcfff
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/machine/include/qemu.inc
View File

@ -1,5 +1,5 @@
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_INSTALL += "gaim sylpheed"

13
meta/conf/machine/qemux86.conf
View File

@ -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 \