debian/changelog | 8 ++++++++ debian/local/10-vmmouse.conf | 6 ++++++ debian/local/69-xorg-vmmouse.rules | 1 + debian/patches/01-enable-detect-in-kvm.diff | 19 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 ++++ 6 files changed, 39 insertions(+)
New commits: commit 3daaa6088f941d3e73d49159803369ca42255966 Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 16:19:56 2010 +0300 Add 01-enable-detect-in-kvm.diff, closes #525039. diff --git a/debian/changelog b/debian/changelog index 0af2da5..104face 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-vmmouse (1:12.6.5-4) UNRELEASED; urgency=low * Add 10-vmmouse.conf. * Add 69-xorg-vmmouse.rules, needed to set ID_INPUT.tags. + * Add 01-enable-detect-in-kvm.diff, closes #525039. -- Timo Aaltonen <[email protected]> Tue, 30 Mar 2010 16:01:35 +0300 diff --git a/debian/patches/01-enable-detect-in-kvm.diff b/debian/patches/01-enable-detect-in-kvm.diff new file mode 100644 index 0000000..9f9cc39 --- /dev/null +++ b/debian/patches/01-enable-detect-in-kvm.diff @@ -0,0 +1,19 @@ +Description: add iopl() back so vmmouse_detect will work in kvm again. +Origin: upstream, reverses http://cgit.freedesktop.org/xorg/driver/xf86-input-vmmouse/commit/?id=bcdec3d0cd4434770cd841c33c030e0d7203881f +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525039 + +diff -Nur xserver-xorg-input-vmmouse-12.6.5/tools/vmmouse_detect.c xserver-xorg-input-vmmouse-12.6.5.new/tools/vmmouse_detect.c +--- xserver-xorg-input-vmmouse-12.6.5/tools/vmmouse_detect.c 2009-05-11 12:59:48.000000000 -0400 ++++ xserver-xorg-input-vmmouse-12.6.5.new/tools/vmmouse_detect.c 2010-03-05 09:53:21.000000000 -0500 +@@ -53,6 +53,11 @@ + signal(SIGSEGV, segvCB); + + #if defined __i386__ || defined __x86_64__ ++ /* ++ * To access i/o ports above 0x3ff, we need to be in iopl(3). ++ */ ++ ++ iopl(3); + if (VMMouseClient_Enable()) { + VMMouseClient_Disable(); + return 0; diff --git a/debian/patches/series b/debian/patches/series index e69de29..1a0c312 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +01-enable-detect-in-kvm.diff commit 8eb233c45d39e92a09cd32c4c1b5d24b644636f4 Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 16:16:16 2010 +0300 Add 69-xorg-vmmouse.rules, needed to set ID_INPUT.tags. diff --git a/debian/changelog b/debian/changelog index 65a6e82..0af2da5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-vmmouse (1:12.6.5-4) UNRELEASED; urgency=low * Add 10-vmmouse.conf. + * Add 69-xorg-vmmouse.rules, needed to set ID_INPUT.tags. -- Timo Aaltonen <[email protected]> Tue, 30 Mar 2010 16:01:35 +0300 diff --git a/debian/local/69-xorg-vmmouse.rules b/debian/local/69-xorg-vmmouse.rules new file mode 100644 index 0000000..7b1bd00 --- /dev/null +++ b/debian/local/69-xorg-vmmouse.rules @@ -0,0 +1 @@ +ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", PROGRAM="/usr/bin/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse" diff --git a/debian/rules b/debian/rules index 2003d9e..17534d9 100755 --- a/debian/rules +++ b/debian/rules @@ -80,6 +80,8 @@ binary-arch: build install serverabi dh_installdocs README dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp --list-missing --exclude=vmmouse_drv.la + install -d debian/xserver-xorg-input-vmmouse/lib/udev/rules.d + install -m 644 debian/local/69-xorg-vmmouse.rules debian/xserver-xorg-input-vmmouse/lib/udev/rules.d install -d debian/xserver-xorg-input-vmmouse/usr/lib/X11/xorg.conf.d install -m 644 debian/local/10-vmmouse.conf debian/xserver-xorg-input-vmmouse/usr/lib/X11/xorg.conf.d dh_installman commit d9d84bb869112cc56d49eeab012b62b84665d885 Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 16:03:55 2010 +0300 Add 10-vmmouse.conf. diff --git a/debian/changelog b/debian/changelog index ab5bd84..65a6e82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-vmmouse (1:12.6.5-4) UNRELEASED; urgency=low + + * Add 10-vmmouse.conf. + + -- Timo Aaltonen <[email protected]> Tue, 30 Mar 2010 16:01:35 +0300 + xserver-xorg-input-vmmouse (1:12.6.5-3) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/local/10-vmmouse.conf b/debian/local/10-vmmouse.conf new file mode 100644 index 0000000..879b604 --- /dev/null +++ b/debian/local/10-vmmouse.conf @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "vmmouse catchall" + MatchTag "vmmouse" + Driver "vmmouse" +EndSection + diff --git a/debian/rules b/debian/rules index 8f9b639..2003d9e 100755 --- a/debian/rules +++ b/debian/rules @@ -80,6 +80,8 @@ binary-arch: build install serverabi dh_installdocs README dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp --list-missing --exclude=vmmouse_drv.la + install -d debian/xserver-xorg-input-vmmouse/usr/lib/X11/xorg.conf.d + install -m 644 debian/local/10-vmmouse.conf debian/xserver-xorg-input-vmmouse/usr/lib/X11/xorg.conf.d dh_installman dh_link dh_strip -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
