diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-03-27 10:48:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-27 11:18:27 +0000 |
commit | 9915f945c904fd7664d073421b803fd1c672c324 (patch) | |
tree | dd043b41e15702ec7e72f2c7abaa42373fab340f /meta/conf | |
parent | f9a92d9534e4fbb8d912c5e8fba8fb6e96286601 (diff) | |
download | poky-9915f945c904fd7664d073421b803fd1c672c324.tar.gz |
qemux86*.conf: replace XSERVER weak assignment with a hard one
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]
(From OE-Core rev: f9c12a42f9777bc66b2ce63a244e655d167025ed)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 90007fb26e..ff666af1f7 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
@@ -14,7 +14,7 @@ KERNEL_IMAGETYPE = "bzImage" | |||
14 | 14 | ||
15 | SERIAL_CONSOLE = "115200 ttyS0" | 15 | SERIAL_CONSOLE = "115200 ttyS0" |
16 | 16 | ||
17 | XSERVER ?= "xserver-xorg \ | 17 | XSERVER = "xserver-xorg \ |
18 | mesa-driver-swrast \ | 18 | mesa-driver-swrast \ |
19 | xf86-input-vmmouse \ | 19 | xf86-input-vmmouse \ |
20 | xf86-input-keyboard \ | 20 | xf86-input-keyboard \ |
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 7a7cbfde8b..5f107bea8b 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -14,7 +14,7 @@ KERNEL_IMAGETYPE = "bzImage" | |||
14 | 14 | ||
15 | SERIAL_CONSOLE = "115200 ttyS0" | 15 | SERIAL_CONSOLE = "115200 ttyS0" |
16 | 16 | ||
17 | XSERVER ?= "xserver-xorg \ | 17 | XSERVER = "xserver-xorg \ |
18 | mesa-driver-swrast \ | 18 | mesa-driver-swrast \ |
19 | xf86-input-vmmouse \ | 19 | xf86-input-vmmouse \ |
20 | xf86-input-keyboard \ | 20 | xf86-input-keyboard \ |