diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-06-18 14:01:34 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-26 15:34:40 +0100 |
| commit | 2a29b7d087c33a26c0b55a3eac7b19d925e6429b (patch) | |
| tree | eb352acba58b9f315d265e5fe643a26f582f76e3 /scripts/lib/bsp/substrate | |
| parent | cad078c4d07941b009e8496ae7ea3f3a903442ee (diff) | |
| download | ast2050-yocto-poky-2a29b7d087c33a26c0b55a3eac7b19d925e6429b.zip ast2050-yocto-poky-2a29b7d087c33a26c0b55a3eac7b19d925e6429b.tar.gz | |
yocto-bsp: update yocto-bsp xorg.conf templates
The non-x86 qemu machines now require an xorg.conf, change the
templates accordingly.
Fixes [YOCTO #2559]
(From meta-yocto rev: d465c09d8df0e6d210ba8cd3c17549a07a8e134d)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate')
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf index 10a6d9a..1351980 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf @@ -14,7 +14,11 @@ EndSection Section "InputDevice" Identifier "Configured Mouse" +{{ if qemuarch == "arm" or qemuarch == "powerpc" or qemuarch == "mips": }} + Driver "mouse" +{{ if qemuarch == "i386" or qemuarch == "x86_64": }} Driver "vmmouse" + Option "CorePointer" Option "Device" "/dev/input/mice" Option "Protocol" "ImPS/2" @@ -32,7 +36,11 @@ EndSection Section "Device" Identifier "Graphics Controller" +{{ if qemuarch == "arm" or qemuarch == "powerpc" or qemuarch == "mips": }} + Driver "fbdev" +{{ if qemuarch == "i386" or qemuarch == "x86_64": }} Driver "vmware" + EndSection Section "Monitor" diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == "i386" or qemuarch == "x86_64": }} xserver-xf86-config_0.1.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == "i386" or qemuarch == "x86_64": }} xserver-xf86-config_0.1.bbappend deleted file mode 100644 index d3420e0..0000000 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == "i386" or qemuarch == "x86_64": }} xserver-xf86-config_0.1.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" |
