package/linuxptp: make initscript options configurable
v3 cover package/linuxptp: make initscript options configurable
After talking to Michael I've taken his patch and did a new version with some modifications/improvements.
This series changes the SysV init script to match the prefered style (used package/busybox/S01syslogd) for init scripts. Since in the old init script 2 daemons were started this is split in two. The names for the scripts now matches the daemons they start.
The systemd service scripts are also renamed to match the daemon names (this is the same name as used in debian).
---
v2 -> v3
- fix the install hooks to match the renamed files
- rename the systemd service scripts to have the same name as for the SysVinit scripts
- update the indentation of the hash file
v1 -> v2
- rename the init script from S65linuxptp to S65ptp4l
- move the phc2sys stuff to S66phc2sys
- use the style form package/busybox/S01syslogd as template
Heiko Thiery (1):
package/linuxptp: make initscript options configurable
package/linuxptp/S65linuxptp | 46 ---------------------------- package/linuxptp/S65ptp4l | 59 ++++++++++++++++++++++++++++++++++++ package/linuxptp/S66phc2sys | 59 ++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 46 deletions(-) delete mode 100644 package/linuxptp/S65linuxptp create mode 100644 package/linuxptp/S65ptp4l create mode 100644 package/linuxptp/S66phc2sys
Signature · 1 line
2.20.1
PATCH v3 1/3 package/linuxptp: make initscript options configurable
The "package/busybox/S01sysklogd" is taken as template to change the init script of the linuxptp daemon. The init script is split two parts because there are 2 daemons (ptp4l and phc2sys).
Let the user supply its own options in /etc/default/ptp4l and /etc/default/phc2sys.
This patch also fixes an issue with the creation of the pid file that is needed to properly stop the daemon again.
--- package/linuxptp/S65linuxptp | 46 ---------------------------- package/linuxptp/S65ptp4l | 59 ++++++++++++++++++++++++++++++++++++ package/linuxptp/S66phc2sys | 59 ++++++++++++++++++++++++++++++++++++ package/linuxptp/linuxptp.mk | 6 ++-- 4 files changed, 122 insertions(+), 48 deletions(-) delete mode 100644 package/linuxptp/S65linuxptp create mode 100644 package/linuxptp/S65ptp4l create mode 100644 package/linuxptp/S66phc2sys
package/linuxptp/S65linuxptp deleted +0 -46
@@ -1,46 +0,0 @@ -#!/bin/sh -# -# Start linuxptp -# - -start() { - printf "Starting linuxptp daemon: " - start-stop-daemon -S -b -q -p /var/run/linuxptp-ptp4l.pid \ - -x /usr/sbin/ptp4l -- -f /etc/linuxptp.cfg - [ $? = 0 ] && echo "OK" || echo "FAIL" - - printf "Starting linuxptp system clock synchronization: " - start-stop-daemon -S -b -q -p /var/run/linuxptp-phc2sys.pid \ - -x /usr/sbin/phc2sys -- -s eth0 -c CLOCK_REALTIME -w -S 1.0 - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping linuxptp system clock synchronization: " - start-stop-daemon -K -q -p /var/run/linuxptp-phc2sys.pid \ - -x /usr/sbin/phc2sys - echo "OK" - - printf "Stopping linuxptp daemon: " - start-stop-daemon -K -q -p /var/run/linuxptp-ptp4l.pid \ - -x /usr/sbin/ptp4l - echo "OK" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $?
package/linuxptp/S65ptp4l new file +59 -0
59 lines not on this page · raw message
package/linuxptp/S66phc2sys new file +59 -0
59 lines not on this page · raw message
package/linuxptp/linuxptp.mk +4 -2
@@ -33,8 +33,10 @@ define LINUXPTP_INSTALL_TARGET_CMDS endef define LINUXPTP_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D $(LINUXPTP_PKGDIR)/S65linuxptp \ - $(TARGET_DIR)/etc/init.d/S65linuxptp + $(INSTALL) -m 755 -D $(LINUXPTP_PKGDIR)/S65ptp4l \ + $(TARGET_DIR)/etc/init.d/S65ptp4l + $(INSTALL) -m 755 -D $(LINUXPTP_PKGDIR)/S66phc2sys \ + $(TARGET_DIR)/etc/init.d/S66phc2sys endef define LINUXPTP_INSTALL_INIT_SYSTEMD
Signature · 1 line
2.20.1
PATCH v3 2/3 package/linuxptp: rename systemd service scripts
In reply to Heiko ThieryUse the same name as for the SysVinit scripts. This name is also used in debian.
linuxptp-system-clock.service -> phc2sys.service
linuxptp.service -> ptp4l.service
---
package/linuxptp/linuxptp.mk | 8 ++++----
.../{linuxptp-system-clock.service => phc2sys.service} | 2 +-
package/linuxptp/{linuxptp.service => ptp4l.service} | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
rename package/linuxptp/{linuxptp-system-clock.service => phc2sys.service} (89%)
rename package/linuxptp/{linuxptp.service => ptp4l.service} (87%)package/linuxptp/linuxptp.mk +4 -4
@@ -40,10 +40,10 @@ define LINUXPTP_INSTALL_INIT_SYSV endef define LINUXPTP_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp.service \ - $(TARGET_DIR)/usr/lib/systemd/system/linuxptp.service - $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp-system-clock.service \ - $(TARGET_DIR)/usr/lib/systemd/system/linuxptp-system-clock.service + $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/ptp4l.service \ + $(TARGET_DIR)/usr/lib/systemd/system/ptp4l.service + $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/phc2sys.service \ + $(TARGET_DIR)/usr/lib/systemd/system/phc2sys.service endef $(eval $(generic-package))
package/linuxptp/phc2sys.service renamed from package/linuxptp/linuxptp-system-clock.service +1 -1
@@ -1,6 +1,6 @@ [Unit] Description=Precision Time Protocol system clock synchronization -After=linuxptp.service +After=ptp4l.service [Service] ExecStart=/usr/sbin/phc2sys -s /dev/ptp0 -c CLOCK_REALTIME -w -S 1.0
package/linuxptp/ptp4l.service renamed from package/linuxptp/linuxptp.service +1 -1
@@ -3,7 +3,7 @@ Description=Precision Time Protocol daemon After=syslog.target network.target Before=time-sync.target Wants=time-sync.target -Wants=linuxptp-system-clock.service +Wants=phc2sys.service [Service] ExecStart=/usr/sbin/ptp4l -f /etc/linuxptp.cfg
Signature · 1 line
2.20.1
PATCH v3 3/3 package/linuxptp: update indentation of hash file
In reply to Heiko Thiery--- package/linuxptp/linuxptp.hash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
package/linuxptp/linuxptp.hash +4 -4
@@ -1,9 +1,9 @@ # From https://sourceforge.net/projects/linuxptp/files/v2.0/ -sha1 592ca42c6146a79c1fcabed7c19fa7af4803d4f6 linuxptp-2.0.tgz -md5 d8bb7374943bb747db7786ac26f17f11 linuxptp-2.0.tgz +sha1 592ca42c6146a79c1fcabed7c19fa7af4803d4f6 linuxptp-2.0.tgz +md5 d8bb7374943bb747db7786ac26f17f11 linuxptp-2.0.tgz # Locally computed: -sha256 0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d linuxptp-2.0.tgz +sha256 0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d linuxptp-2.0.tgz # Hash for license file: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
Signature · 1 line
2.20.1
PATCH v3 3/3 package/linuxptp: update indentation of hash file
Quoted 14 lines · Heiko Thiery
Signed-off-by Heiko Thiery <[email protected]>--- package/linuxptp/linuxptp.hash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)package/linuxptp/linuxptp.hash +0
-2@@ -1,9 +1,9 @@ # From https://sourceforge.net/projects/linuxptp/files/v2.0/ -sha1 592ca42c6146a79c1fcabed7c19fa7af4803d4f6 linuxptp-2.0.tgz -md5 d8bb7374943bb747db7786ac26f17f11 linuxptp-2.0.tgz
package/linuxptp/linuxptp.hash line 9
Quoted 10 lines
package/linuxptp/linuxptp.hash +4
-2+sha1 592ca42c6146a79c1fcabed7c19fa7af4803d4f6 linuxptp-2.0.tgz +md5 d8bb7374943bb747db7786ac26f17f11 linuxptp-2.0.tgz # Locally computed: -sha256 0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d linuxptp-2.0.tgz +sha256 0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d linuxptp-2.0.tgz # Hash for license file: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
Is the current indentation causing any problem? If not, I'd leave this change to be made in a package version bump.
Signature · 1 line
Carlos Santos <[email protected]>
PATCH v3 3/3 package/linuxptp: update indentation of hash file
Hi Carlos,
Quoted 22 lines · Carlos Santos
Quoted 21 lines · Heiko Thiery
Signed-off-by Heiko Thiery <[email protected]>--- package/linuxptp/linuxptp.hash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)package/linuxptp/linuxptp.hash +3
-3@@ -1,9 +1,9 @@ # From https://sourceforge.net/projects/linuxptp/files/v2.0/ -sha1 592ca42c6146a79c1fcabed7c19fa7af4803d4f6 linuxptp-2.0.tgz -md5 d8bb7374943bb747db7786ac26f17f11 linuxptp-2.0.tgz +sha1 592ca42c6146a79c1fcabed7c19fa7af4803d4f6 linuxptp-2.0.tgz +md5 d8bb7374943bb747db7786ac26f17f11 linuxptp-2.0.tgz # Locally computed: -sha256 0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d linuxptp-2.0.tgz +sha256 0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d linuxptp-2.0.tgz
Quoted 7 lines
package/linuxptp/linuxptp.hash line 9
Quoted 3 lines
package/linuxptp/linuxptp.hash +1
-1# Hash for license file: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGIs the current indentation causing any problem? If not, I'd leave this change to be made in a package version bump.
No there is no problem. We just can ignore this commit.
Signature · 1 line
Heiko
PATCH v3 1/3 package/linuxptp: make initscript options configurable
In reply to Heiko ThieryQuoted 5 lines · Heiko Thiery
The "package/busybox/S01sysklogd" is taken as template to change the init script of the linuxptp daemon. The init script is split two parts because there are 2 daemons (ptp4l and phc2sys).
Quoted 8 lines
Let the user supply its own options in
/etc/default/ptp4land/etc/default/phc2sys.This patch also fixes an issue with the creation of the pid file that is needed to properly stop the daemon again.
Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>
---
Testes on an Intel C3000 device
02:00.0 Ethernet controller: Intel Corporation I210 Gigabit
Network Connection (rev 03)
after adding
==> /etc/default/phc2sys <== PHC2SYS_ARGS="-s enp2s0 -c CLOCK_REALTIME -w -S 1.0"
==> /etc/default/ptp4l <==
PTP4L_ARGS="-i enp2s0 -f /etc/linuxptp.cfg -m"
PATCH v3 1/3 package/linuxptp: make initscript options configurable
Quoted 23 lines · Carlos Santos
Quoted 5 lines · Heiko Thiery
The "package/busybox/S01sysklogd" is taken as template to change the init script of the linuxptp daemon. The init script is split two parts because there are 2 daemons (ptp4l and phc2sys).
Quoted 8 lines
Let the user supply its own options in
/etc/default/ptp4land/etc/default/phc2sys.This patch also fixes an issue with the creation of the pid file that is needed to properly stop the daemon again.
Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>Tested-by Carlos Santos <[email protected]>---
Testes on an Intel C3000 device02:00.0 Ethernet controller: Intel Corporation I210 Gigabit
Network Connection (rev 03)
Quoted 7 lines
after adding
==>
/etc/default/phc2sys<== PHC2SYS_ARGS="-s enp2s0 -cCLOCK_REALTIME-w -S 1.0"==>
/etc/default/ptp4l<==
PTP4L_ARGS="-i enp2s0 -f/etc/linuxptp.cfg-m"
Hum, maybe it would be better just to use
PHC2SYS_ARGS="-s /dev/ptp0 -c CLOCK_REALTIME -w -S 1.0"
in S66phc2sys, matching phc2sys.service.
Signature · 1 line
Carlos Santos <[email protected]>
PATCH v3 1/3 package/linuxptp: make initscript options configurable
Hi Carlos,
Quoted 29 lines · Carlos Santos
Quoted 28 lines · Carlos Santos
Quoted 5 lines · Heiko Thiery
The "package/busybox/S01sysklogd" is taken as template to change the init script of the linuxptp daemon. The init script is split two parts because there are 2 daemons (ptp4l and phc2sys).
Quoted 8 lines
Let the user supply its own options in
/etc/default/ptp4land/etc/default/phc2sys.This patch also fixes an issue with the creation of the pid file that is needed to properly stop the daemon again.
Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>Tested-by Carlos Santos <[email protected]>---
Testes on an Intel C3000 device02:00.0 Ethernet controller: Intel Corporation I210 Gigabit
Network Connection (rev 03)after adding
==>
/etc/default/phc2sys<== PHC2SYS_ARGS="-s enp2s0 -cCLOCK_REALTIME-w -S 1.0"
Quoted 7 lines
Quoted 2 lines
==>
/etc/default/ptp4l<==
PTP4L_ARGS="-i enp2s0 -f/etc/linuxptp.cfg-m"Hum, maybe it would be better just to use
PHC2SYS_ARGS="-s /dev/ptp0 -c CLOCK_REALTIME -w -S 1.0"
What about doing the that:
package/linuxptp/S66phc2sys +1 -1
@@ -7,7 +7,7 @@ DAEMON="phc2sys" PIDFILE="/var/run/$DAEMON.pid" -PHC2SYS_ARGS="-s eth0 -c CLOCK_REALTIME -w -S 1.0" +PHC2SYS_ARGS="-a -r -S 1.0"
This will do an automatically configuration as default.
Signature · 1 line
Heiko
PATCH v3 1/3 package/linuxptp: make initscript options configurable
Quoted 54 lines · Heiko Thiery
Hi Carlos,
Quoted 29 lines · Carlos Santos
Quoted 28 lines · Carlos Santos
Quoted 5 lines · Heiko Thiery
The "package/busybox/S01sysklogd" is taken as template to change the init script of the linuxptp daemon. The init script is split two parts because there are 2 daemons (ptp4l and phc2sys).
Quoted 8 lines
Let the user supply its own options in
/etc/default/ptp4land/etc/default/phc2sys.This patch also fixes an issue with the creation of the pid file that is needed to properly stop the daemon again.
Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>Tested-by Carlos Santos <[email protected]>---
Testes on an Intel C3000 device02:00.0 Ethernet controller: Intel Corporation I210 Gigabit
Network Connection (rev 03)after adding
==>
/etc/default/phc2sys<== PHC2SYS_ARGS="-s enp2s0 -cCLOCK_REALTIME-w -S 1.0"Quoted 7 lines
Quoted 2 lines
==>
/etc/default/ptp4l<==
PTP4L_ARGS="-i enp2s0 -f/etc/linuxptp.cfg-m"Hum, maybe it would be better just to use
PHC2SYS_ARGS="-s /dev/ptp0 -c CLOCK_REALTIME -w -S 1.0"What about doing the that:
package/linuxptp/S66phc2sys +1
-1@@ -7,7 +7,7 @@ DAEMON="phc2sys" PIDFILE="/var/run/$DAEMON.pid" -PHC2SYS_ARGS="-s eth0 -c CLOCK_REALTIME -w -S 1.0" +PHC2SYS_ARGS="-a -r -S 1.0"
Quoted 1 line
This will do an automatically configuration as default.
Yeah, that works too.
Signature · 1 line
Carlos Santos <[email protected]>
PATCH v3 2/3 package/linuxptp: rename systemd service scripts
In reply to Heiko ThieryQuoted 8 lines · Heiko Thiery
Use the same name as for the SysVinit scripts. This name is also used in debian.
linuxptp-system-clock.service -> phc2sys.service
linuxptp.service -> ptp4l.serviceSigned-off-by Heiko Thiery <[email protected]>
---
Tested on an Intel C3000 device
02:00.0 Ethernet controller: Intel Corporation I210 Gigabit
Network Connection (rev 03)
after adding
==> /etc/linuxptp.cfg <==
[global]
slaveOnly 1delay_mechanism Autonetwork_transport UDPv4time_stamping hardwarestep_threshold 1.0
[enp2s0]