From 2a29b7d087c33a26c0b55a3eac7b19d925e6429b Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 18 Jun 2012 14:01:34 -0500 Subject: 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 Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf | 8 ++++++++ ...r qemuarch == \"x86_64\": }} xserver-xf86-config_0.1.bbappend" | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == \"i386\" or qemuarch == \"x86_64\": }} xserver-xf86-config_0.1.bbappend" (limited to 'scripts/lib') 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 10a6d9a0bc..13519804bc 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 d3420e0aea..0000000000 --- "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)}:" -- cgit v1.2.3-54-g00ecf