diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-09-22 19:45:53 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-22 19:45:53 +0000 |
| commit | 11b620bbf09b5e6bcf0412fc7c5e42f0fb5b817d (patch) | |
| tree | 019f8dfae4ce841c0c0ebdc4bb8f651c6bc7b4f5 | |
| parent | cd49c7be0f05ac20ec76176f921936b00e1b2e8f (diff) | |
packages/xserver/xserver-kdrive_20050624.bb: add serial patch from #340
| -rw-r--r-- | packages/xserver/xserver-kdrive/no-serial-probing.patch | 13 | ||||
| -rw-r--r-- | packages/xserver/xserver-kdrive_20050624.bb | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/packages/xserver/xserver-kdrive/no-serial-probing.patch b/packages/xserver/xserver-kdrive/no-serial-probing.patch new file mode 100644 index 0000000000..35ccadaa8d --- /dev/null +++ b/packages/xserver/xserver-kdrive/no-serial-probing.patch @@ -0,0 +1,13 @@ +--- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700 ++++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700 +@@ -927,8 +927,10 @@ char *kdefaultMouse[] = { + "/dev/psaux", + "/dev/input/mice", + "/dev/adbmouse", ++#ifdef BREAK_MY_SERIAL_CONSOLE + "/dev/ttyS0", + "/dev/ttyS1", ++#endif + }; + + #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0])) diff --git a/packages/xserver/xserver-kdrive_20050624.bb b/packages/xserver/xserver-kdrive_20050624.bb index 4031db9c2b..78e77a23a5 100644 --- a/packages/xserver/xserver-kdrive_20050624.bb +++ b/packages/xserver/xserver-kdrive_20050624.bb @@ -19,7 +19,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r10" +PR = "r12" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" @@ -34,12 +34,14 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ file://kmode.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" + S = "${WORKDIR}/xserver" inherit autotools pkgconfig |