Patchwork qemux86*.conf: replace XSERVER weak assignment with a hard one

login
register
mail settings
Submitter Laurentiu Palcu
Date March 27, 2013, 8:48 a.m.
Message ID <1364374103-12809-1-git-send-email-laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/47019/
State Accepted
Commit 9915f945c904fd7664d073421b803fd1c672c324
Headers show

Comments

Laurentiu Palcu - March 27, 2013, 8:48 a.m.
Because the qemu.inc is now included before the XSERVER assignment, the
xf86-video-vmware and xf86-video-vmmouse are not built and the X for
qemux86 and qemux86-64 does not start.

[YOCTO #4124]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta/conf/machine/qemux86-64.conf |    2 +-
 meta/conf/machine/qemux86.conf    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 90007fb..ff666af 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -14,7 +14,7 @@  KERNEL_IMAGETYPE = "bzImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-XSERVER ?= "xserver-xorg \
+XSERVER = "xserver-xorg \
            mesa-driver-swrast \
            xf86-input-vmmouse \
            xf86-input-keyboard \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 7a7cbfd..5f107be 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -14,7 +14,7 @@  KERNEL_IMAGETYPE = "bzImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-XSERVER ?= "xserver-xorg \
+XSERVER = "xserver-xorg \
            mesa-driver-swrast \
            xf86-input-vmmouse \
            xf86-input-keyboard \