rpms/xorg-x11-drv-wacom
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use systemd for starting inputattach

Browse Source
This commit is contained in:
Peter Hutterer 2013-12-09 14:11:15 +10:00
parent 45434f46c5
commit 6413a9564a
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
70-wacom.rules
View File

@ -9,7 +9,7 @@ SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Seri
SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
# inputattach # inputattach
SUBSYSTEM=="tty|pnp", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf*", RUN+="/usr/sbin/modprobe wacom_w8001", RUN+="/usr/sbin/inputattach --daemon -w8001 /dev/%k" SUBSYSTEM=="tty|pnp", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf*", RUN{builtin}="kmod load wacom_w8001", TAG+="systemd", ENV{SYSTEMD_WANTS}+="wacom-inputattach@%k.service"
LABEL="wacom_end" LABEL="wacom_end"

7
wacom-inputattach@.service Normal file
View File

@ -0,0 +1,7 @@
[Unit]
Description="inputattach for Wacom ISDv4-compatible serial devices"
[Service]
Type=simple
ExecStart=/usr/bin/inputattach -w8001 /dev/%I

11
xorg-x11-drv-wacom.spec
View File

@ -9,7 +9,7 @@
Summary: Xorg X11 wacom input driver Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom Name: xorg-x11-drv-wacom
Version: 0.23.0 Version: 0.23.0
Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: GPLv2+ License: GPLv2+
Group: User Interface/X Hardware Support Group: User Interface/X Hardware Support
@ -22,6 +22,7 @@ Source2: commitid
Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
%endif %endif
Source3: 70-wacom.rules Source3: 70-wacom.rules
Source4: wacom-inputattach@.service
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
@ -29,7 +30,7 @@ BuildRequires: xorg-x11-server-devel >= 1.10.99.902
BuildRequires: xorg-x11-util-macros >= 1.3.0 BuildRequires: xorg-x11-util-macros >= 1.3.0
BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
BuildRequires: systemd-devel BuildRequires: systemd systemd-devel
Requires: Xorg %(xserver-sdk-abi-requires ansic) Requires: Xorg %(xserver-sdk-abi-requires ansic)
Requires: Xorg %(xserver-sdk-abi-requires xinput) Requires: Xorg %(xserver-sdk-abi-requires xinput)
@ -59,6 +60,8 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-wacom.rules install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-wacom.rules
install -d $RPM_BUILD_ROOT%{_unitdir}
install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/wacom-inputattach@.service
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -76,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/X11/xorg.conf.d/50-wacom.conf %{_datadir}/X11/xorg.conf.d/50-wacom.conf
%{_bindir}/xsetwacom %{_bindir}/xsetwacom
%{_prefix}/lib/udev/rules.d/70-wacom.rules %{_prefix}/lib/udev/rules.d/70-wacom.rules
%{_unitdir}/wacom-inputattach@.service
%package devel %package devel
Summary: Xorg X11 wacom input driver development package Summary: Xorg X11 wacom input driver development package
@ -98,6 +102,9 @@ X.Org X11 wacom input driver development files.
%{_bindir}/isdv4-serial-debugger %{_bindir}/isdv4-serial-debugger
%changelog %changelog
* Mon Dec 09 2013 Peter Hutterer <peter.hutterer@redhat.com> 0.23.0-5
- Use systemd for starting inputattach
* Wed Nov 20 2013 Adam Jackson <ajax@redhat.com> - 0.23.0-4 * Wed Nov 20 2013 Adam Jackson <ajax@redhat.com> - 0.23.0-4
- 1.15RC2 ABI rebuild - 1.15RC2 ABI rebuild