diff mbox

[v2] xdriver_x86-input-joystick: Install server config

Message ID 1460501496-2305-1-git-send-email-ezequiel@vanguardiasur.com.ar
State Accepted
Headers show

Commit Message

Ezequiel Garcia April 12, 2016, 10:51 p.m. UTC
In order for joysticks to be detected and used with this
driver, we need an xorg-server configuration file. This commit
installs such conf file to the default X11 xorg.conf.d path,
so we can at least provide a working template.

Users with specific needs can of course override it.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf        | 6 ++++++
 .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk    | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf

Comments

Thomas Petazzoni April 13, 2016, 8:14 p.m. UTC | #1
Hello,

First of all, your patch, as taken from patchwork, had a mismatch
between the From: and the Signed-off-by. Indeed, the From uses í in
your last name, while the Signed-off-by uses the regular i.

The problem is that patchwork has recorded that in the past you were
sending your e-mails with García, so even if nowadays you sent them
with Garcia, it keeps using García when doing "git pwam", leading to
this inconsistency. I wouldn't have noticed if there wasn't this silly
git hook checking for such things, which complained:

remote: Refusing to update refs/heads/master:
remote:     4470abb693967f6bcf0828f50f9a32562adb85af..65933ad61df36ac32b7a9405aa7f674cd76a4ac2
remote: 
remote: Missing Author's Signed-off-by tag
remote: 

Another comment is: when you send a v2, please include a changelog from
the previous version. Some more comments below.

On Tue, 12 Apr 2016 19:51:36 -0300, Ezequiel Garcia wrote:

> +define XDRIVER_XF86_INPUT_JOYSTICK_CONF
> +	$(INSTALL) -m 0644 -D \
> +		package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf \

You should have used $(XDRIVER_XF86_INPUT_JOYSTICK_PKGDIR) instead.

> +		$(TARGET_DIR)/usr/share/X11/xorg.conf.d/50-joystick.conf
> +

This empty line was useless.

> +endef
> +XDRIVER_XF86_INPUT_JOYSTICK_POST_INSTALL_TARGET_HOOKS += XDRIVER_XF86_INPUT_JOYSTICK_CONF

I've fixed up those minor issues and applied. Please test what I've
committed to make sure I didn't introduce a typo.

Thanks a lot!

Thomas
Ezequiel Garcia April 14, 2016, 12:42 p.m. UTC | #2
Thomas,

On 13 April 2016 at 17:14, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> First of all, your patch, as taken from patchwork, had a mismatch
> between the From: and the Signed-off-by. Indeed, the From uses í in
> your last name, while the Signed-off-by uses the regular i.
>

Yes, I stumbled across this in the past.

Who's behind patchwork, so I can ask for a name change on my account?
Thomas Petazzoni April 14, 2016, 1:05 p.m. UTC | #3
Hello,

On Thu, 14 Apr 2016 09:42:04 -0300, Ezequiel Garcia wrote:

> Who's behind patchwork, so I can ask for a name change on my account?

Jeremy Kerr <jk@ozlabs.org>

Thanks!

Thomas
diff mbox

Patch

diff --git a/package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf b/package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf
new file mode 100644
index 000000000000..95a295ab0010
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf
@@ -0,0 +1,6 @@ 
+Section "InputClass"
+	Identifier "joystick catchall"
+	MatchIsJoystick "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "joystick"
+EndSection
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index c63312dd099f..67144eda652b 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -11,4 +11,12 @@  XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT
 XDRIVER_XF86_INPUT_JOYSTICK_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
+define XDRIVER_XF86_INPUT_JOYSTICK_CONF
+	$(INSTALL) -m 0644 -D \
+		package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf \
+		$(TARGET_DIR)/usr/share/X11/xorg.conf.d/50-joystick.conf
+
+endef
+XDRIVER_XF86_INPUT_JOYSTICK_POST_INSTALL_TARGET_HOOKS += XDRIVER_XF86_INPUT_JOYSTICK_CONF
+
 $(eval $(autotools-package))