xdriver_x86-input-joystick: Install server config

PATCH Superseded Ezequiel Garcia 3 participants 6 messages Apr 12, 2016 – Apr 14, 2016

Share & tools

Ezequiel Garcia

author

2016-04-12 05:37 UTC #0 lore raw

PATCH 1/1 xdriver_x86-input-joystick: Install server config

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 <[email protected]>

---
 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

package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf new file +6 -0

new file mode 100644
index 000000000000..95a295ab0010
@@ -0,0 +1,6 @@
+Section "InputClass"
+	Identifier "joystick catchall"
+	MatchIsJoystick "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "joystick"
+EndSection

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +8 -0

index c63312dd099f..8054743af038 100644
@@ -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/
+
+endef
+XDRIVER_XF86_INPUT_JOYSTICK_POST_INSTALL_TARGET_HOOKS += XDRIVER_XF86_INPUT_JOYSTICK_CONF
+
 $(eval $(autotools-package))

Signature · 1 line

2.7.0

Arnout Vandecappelle

2016-04-12 22:31 UTC #1 lore raw

PATCH 1/1 xdriver_x86-input-joystick: Install server config

Quoted 31 lines · Ezequiel Garcia

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 <[email protected]>
---
  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
package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf new file +6 -0
new file mode 100644
index 000000000000..95a295ab0010
@@ -0,0 +1,6 @@
+Section "InputClass"
+	Identifier "joystick catchall"
+	MatchIsJoystick "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "joystick"
+EndSection
package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +0 -0
index c63312dd099f..8054743af038 100644

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT · line 17

Quoted 7 lines

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +4 -0

@@ -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/

With -D, you should put the target filename as well, so

	$(INSTALL) -m 0644 -D \
		package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf \
		$(TARGET_DIR)/usr/share/X11/xorg.conf.d/50-joystick.conf

With that:

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 6 lines

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +4 -0
+
+endef
+XDRIVER_XF86_INPUT_JOYSTICK_POST_INSTALL_TARGET_HOOKS += XDRIVER_XF86_INPUT_JOYSTICK_CONF
+
  $(eval $(autotools-package))

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Ezequiel Garcia

author

2016-04-12 22:51 UTC #2 lore raw

PATCH v2 1/1 xdriver_x86-input-joystick: Install server config

In reply to Ezequiel Garcia

Users with specific needs can of course override it.

Signed-off-by Ezequiel Garcia <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 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

package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf new file +6 -0

new file mode 100644
index 000000000000..95a295ab0010
@@ -0,0 +1,6 @@
+Section "InputClass"
+	Identifier "joystick catchall"
+	MatchIsJoystick "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "joystick"
+EndSection

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +8 -0

index c63312dd099f..67144eda652b 100644
@@ -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))

Signature · 1 line

2.7.0

Thomas Petazzoni

2016-04-13 20:14 UTC #3 lore raw

PATCH v2 1/1 xdriver_x86-input-joystick: Install server config

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.

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT · line 16

Quoted 3 lines · Ezequiel Garcia

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +3 -0
+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.

Review

Quoted 2 lines

(quoted diff) +2 -0

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

This empty line was useless.

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT · line 20

Quoted 2 lines

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +2 -0
+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

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Ezequiel Garcia

author

2016-04-14 12:42 UTC #4 lore raw

PATCH v2 1/1 xdriver_x86-input-joystick: Install server config

Thomas,

Quoted 6 lines · Thomas Petazzoni

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?

Signature · 2 lines

Ezequiel Garc?a, VanguardiaSur
www.vanguardiasur.com.ar

Thomas Petazzoni

2016-04-14 13:05 UTC #5 lore raw

PATCH v2 1/1 xdriver_x86-input-joystick: Install server config

Hello,

Quoted 1 line · Ezequiel Garcia

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

Jeremy Kerr <[email protected]>

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com