From 65e54e3a491d985da672f606a857cb1f3f256605 Mon Sep 17 00:00:00 2001 From: Luca Fancellu Date: Wed, 11 Oct 2023 17:33:46 +0100 Subject: [PATCH] linuxptp: add systemd services Add systemd services phc2sys@.service and ptp4l@.service, these services are taken from the Ubuntu/Debian linuxptp package. Update the recipe to install them when needed using the systemd bbclass, the services are disabled by default. Signed-off-by: Luca Fancellu Signed-off-by: Khem Raj --- .../linuxptp/linuxptp/systemd/phc2sys@.service | 13 +++++++++++++ .../linuxptp/linuxptp/systemd/ptp4l@.service | 11 +++++++++++ .../linuxptp/linuxptp_4.1.bb | 16 ++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service b/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service new file mode 100644 index 00000000000..dd2512bdca1 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Synchronize system clock or PTP hardware clock (PHC) +Documentation=man:phc2sys +Requires=ptp4l.service +After=ptp4l.service +Before=time-sync.target + +[Service] +Type=simple +ExecStart=/usr/sbin/phc2sys -w -s %I + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service b/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service new file mode 100644 index 00000000000..1bad2d72df6 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service @@ -0,0 +1,11 @@ +[Unit] +Description=Precision Time Protocol (PTP) service for %I +Documentation=man:ptp4l +After=sys-subsystem-net-devices-%i.device + +[Service] +Type=simple +ExecStart=/usr/sbin/ptp4l -f /etc/linuxptp/ptp4l.conf -i %I + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb index 3c7efbdeca7..95ed76e621e 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb @@ -11,11 +11,15 @@ SRC_URI = "${LINUXPTP_SRC_URI}/files/v4.1/linuxptp-${PV}.tgz \ file://build-Allow-CC-and-prefix-to-be-overriden.patch \ file://Use-cross-cpp-in-incdefs.patch \ file://0001-include-string.h-for-strncpy.patch \ + file://systemd/phc2sys@.service \ + file://systemd/ptp4l@.service \ " SRC_URI[md5sum] = "1db8699fc155965341759be5e5aad938" SRC_URI[sha256sum] = "e1743d44f8208897e30895da3579e670ff919b914feb4b5a949f3e421ddde535" +inherit systemd + UPSTREAM_CHECK_URI = "${LINUXPTP_SRC_URI}/files/" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" @@ -23,6 +27,8 @@ EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}' mandir=${mandir}" export KBUILD_OUTPUT="${RECIPE_SYSROOT}" +LINUXPTP_SYSTEMD_SERVICES = "phc2sys@.service ptp4l@.service" + do_install() { oe_runmake install DESTDIR=${D} prefix=${prefix} @@ -35,8 +41,18 @@ do_install() { install -d ${D}/${sysconfdir}/linuxptp/ install -m 644 ${S}/configs/default.cfg \ ${D}${sysconfdir}/linuxptp/ptp4l.conf + + # Install systemd services + install -d ${D}/${systemd_unitdir}/system/ + for service in ${LINUXPTP_SYSTEMD_SERVICES}; do + install -m 644 ${WORKDIR}/systemd/$service \ + ${D}/${systemd_unitdir}/system/$service + done } +SYSTEMD_SERVICE:${PN} = "${LINUXPTP_SYSTEMD_SERVICES}" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + PACKAGES =+ "${PN}-configs" FILES:${PN}-configs += "${docdir}"