diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-02-10 14:27:21 +0000 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-02-10 14:34:15 +0000 |
| commit | bf422fcfff1e5e1b635782ae3c896c9318190159 (patch) | |
| tree | 888b93f21a28b28d5df44dca7091c996e0e7faad /meta | |
| parent | 62ab7dac395c5f254606ca20aae43c1f3bb3b27e (diff) | |
| download | openembedded-core-bf422fcfff1e5e1b635782ae3c896c9318190159.tar.gz openembedded-core-bf422fcfff1e5e1b635782ae3c896c9318190159.tar.bz2 openembedded-core-bf422fcfff1e5e1b635782ae3c896c9318190159.zip | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86.conf | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 1379cdd855..cba8576612 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -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" 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 \ |