[xorg-server] make sure input autodetection with udev actually works

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 93 insertions, 0 deletions

diff --git a/patches/xorg-server-1.7.5/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff b/patches/xorg-server-1.7.5/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
new file mode 100644
index 000000000..38d8d8dfd
--- /dev/null
+++ b/patches/xorg-server-1.7.5/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
@@ -0,0 +1,34 @@
+From 4ae407a5a308febf63de27a62f8c301c73b37d3e Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Tue, 6 Oct 2009 17:44:33 +0200
+Subject: [PATCH 1/5] Move config_init() after CreateWellKnownSockets() and InitCoreDevices()
+
+config_init() can now add devices directly instead of scheduling a
+timer.
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ dix/main.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: xorg-server/dix/main.c
+===================================================================
+--- xorg-server.orig/dix/main.c
++++ xorg-server/dix/main.c
+@@ -168,7 +168,6 @@
+ 	InitBlockAndWakeupHandlers();
+ 	/* Perform any operating system dependent initializations you'd like */
+ 	OsInit();
+-        config_init();
+ 	if(serverGeneration == 1)
+ 	{
+ 	    CreateWellKnownSockets();
+@@ -256,6 +255,7 @@
+         InitCoreDevices();
+ 	InitInput(argc, argv);
+ 	InitAndStartDevices();
++        config_init();
+ 
+ 	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+ 
diff --git a/patches/xorg-server-1.7.5/14-config-add-example-udev-rules.diff b/patches/xorg-server-1.7.5/14-config-add-example-udev-rules.diff
new file mode 100644
index 000000000..e8523f061
--- /dev/null
+++ b/patches/xorg-server-1.7.5/14-config-add-example-udev-rules.diff
@@ -0,0 +1,27 @@
+From 0fef4e506d6278434fe82bc2697354f6159667df Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Fri, 16 Oct 2009 09:32:44 +0200
+Subject: [PATCH 4/5] config: add example udev rules
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ config/x11-input.rules |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+ create mode 100644 config/x11-input.rules
+
+diff --git a/config/x11-input.rules b/config/x11-input.rules
+new file mode 100644
+index 0000000..59ef034
+--- /dev/null
++++ b/config/x11-input.rules
+@@ -0,0 +1,7 @@
++SUBSYSTEM!="input", GOTO="x11_input_end"
++
++KERNEL=="event*", ENV{x11_driver}="evdev"
++KERNEL=="event*", ENV{ID_CLASS}=="kbd", ENV{xkb.layout}="us"
++KERNEL=="event*", ENV{ID_CLASS}=="mouse", ATTRS{protocol}=="AlpsPS/2", ENV{x11_driver}="synaptics"
++
++LABEL="x11_input_end"
+-- 
+1.6.5
+
diff --git a/patches/xorg-server-1.7.5/install-udev-rule.diff b/patches/xorg-server-1.7.5/install-udev-rule.diff
new file mode 100644
index 000000000..d1c6813e2
--- /dev/null
+++ b/patches/xorg-server-1.7.5/install-udev-rule.diff
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: install x11-input.rules
+
+install x11-input.rules to /lib/udev/rules.d/
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ config/Makefile.am |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: b/config/Makefile.am
+===================================================================
+--- a/config/Makefile.am
++++ b/config/Makefile.am
+@@ -9,6 +9,9 @@ AM_CFLAGS += @UDEV_CFLAGS@
+ libconfig_la_SOURCES += udev.c
+ libconfig_la_LIBADD = @UDEV_LIBS@
+ 
++udevrulesdir = /lib/udev/rules.d
++udevrules_DATA = x11-input.rules
++
+ else
+ 
+ if CONFIG_NEED_DBUS
diff --git a/patches/xorg-server-1.7.5/series b/patches/xorg-server-1.7.5/series
index 634e81961..8245ed020 100644
--- a/patches/xorg-server-1.7.5/series
+++ b/patches/xorg-server-1.7.5/series
@@ -1 +1,4 @@
+11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
 12-Add-libudev-input-hotplug-backend.diff
+14-config-add-example-udev-rules.diff
+install-udev-rule.diff
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 5d997608c..ec9a7b013 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -369,6 +369,11 @@ ifdef PTXCONF_XORG_SERVER_CONFIG_FILES_XORG_CONF
 		/etc/X11/xorg.conf)
 endif
 
+ifdef PTXCONF_XORG_SERVER_UDEV
+	@$(call install_copy, xorg-server, 0, 0, 0644, -, \
+		/lib/udev/rules.d/x11-input.rules)
+endif
+
 ifdef PTXCONF_XORG_SERVER_XVFB
 	@$(call install_copy, xorg-server, 0, 0, 0755, -, \
 		$(XORG_PREFIX)/bin/Xvfb)