rpms/gpsd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

replace udev hotplug script with gpsdctl service (#909563)

Browse Source
This commit is contained in:
Miroslav Lichvar 2014-02-20 13:47:00 +01:00
parent 0c2882a9cd
commit f8d5e9ad38
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gpsd.spec
View File

@ -11,6 +11,7 @@ URL: http://catb.org/gpsd/
Source0: http://download.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz Source0: http://download.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
Source10: gpsd.service Source10: gpsd.service
Source11: gpsd.sysconfig Source11: gpsd.sysconfig
Source12: gpsdctl.service
# PPS seems to be working without cap_sys_time # PPS seems to be working without cap_sys_time
Patch1: gpsd-nolibcap.patch Patch1: gpsd-nolibcap.patch
# allow multiple options in LINKFLAGS # allow multiple options in LINKFLAGS
@ -118,6 +119,8 @@ DESTDIR=%{buildroot} scons install
%{__install} -d -m 0755 %{buildroot}%{_unitdir} %{__install} -d -m 0755 %{buildroot}%{_unitdir}
%{__install} -p -m 0644 %{SOURCE10} \ %{__install} -p -m 0644 %{SOURCE10} \
%{buildroot}%{_unitdir}/gpsd.service %{buildroot}%{_unitdir}/gpsd.service
%{__install} -p -m 0644 %{SOURCE12} \
%{buildroot}%{_unitdir}/gpsdctl@.service
%{__install} -p -m 0644 systemd/gpsd.socket \ %{__install} -p -m 0644 systemd/gpsd.socket \
%{buildroot}%{_unitdir}/gpsd.socket %{buildroot}%{_unitdir}/gpsd.socket
@ -130,9 +133,9 @@ DESTDIR=%{buildroot} scons install
%{__install} -p -m 0644 gpsd.rules \ %{__install} -p -m 0644 gpsd.rules \
%{buildroot}%{_udevrulesdir}/99-gpsd.rules %{buildroot}%{_udevrulesdir}/99-gpsd.rules
# hotplug script # Use gpsdctl service instead of hotplug script
%{__install} -d -m 0755 %{buildroot}%{_prefix}/lib/udev sed -i 's|RUN+="/lib/udev/gpsd.hotplug"|TAG+="systemd", ENV{SYSTEMD_WANTS}="gpsdctl@%k.service"|' \
%{__install} -p -m 0755 gpsd.hotplug %{buildroot}%{_prefix}/lib/udev %{buildroot}%{_udevrulesdir}/99-gpsd.rules
# Install the .desktop files # Install the .desktop files
desktop-file-install \ desktop-file-install \
@ -189,8 +192,8 @@ done
%{_bindir}/gpsctl %{_bindir}/gpsctl
%{_unitdir}/gpsd.service %{_unitdir}/gpsd.service
%{_unitdir}/gpsd.socket %{_unitdir}/gpsd.socket
%{_unitdir}/gpsdctl@.service
%{_udevrulesdir}/*.rules %{_udevrulesdir}/*.rules
%{_prefix}/lib/udev/gpsd*
%{_mandir}/man8/gpsd.8* %{_mandir}/man8/gpsd.8*
%{_mandir}/man8/gpsdctl.8* %{_mandir}/man8/gpsdctl.8*
%{_mandir}/man8/gpsinit.8* %{_mandir}/man8/gpsinit.8*

12
gpsdctl.service Normal file
View File

@ -0,0 +1,12 @@
[Unit]
Description=Manage %I for GPS daemon
Requires=gpsd.socket
BindsTo=dev-%i.device
After=dev-%i.device
[Service]
Type=oneshot
EnvironmentFile=-/etc/sysconfig/gpsd
RemainAfterExit=yes
ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl add /dev/%I || :"
ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl remove /dev/%I || :"