similarity index 85%
rename from meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service
rename to meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service.in
@@ -7,7 +7,7 @@ Before=time-sync.target
[Service]
Type=simple
-ExecStart=/usr/sbin/phc2sys -w -s %I
+ExecStart=@SBINDIR@/phc2sys -w -s %I
[Install]
WantedBy=multi-user.target
similarity index 73%
rename from meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service
rename to meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service.in
@@ -5,7 +5,7 @@ After=sys-subsystem-net-devices-%i.device
[Service]
Type=simple
-ExecStart=/usr/sbin/ptp4l -f /etc/linuxptp/ptp4l.conf -i %I
+ExecStart=@SBINDIR@/ptp4l -f @SYSCONFDIR@/linuxptp/ptp4l.conf -i %I
[Install]
WantedBy=multi-user.target
@@ -9,8 +9,8 @@ LINUXPTP_SRC_URI = "http://sourceforge.net/projects/linuxptp"
SRC_URI = "${LINUXPTP_SRC_URI}/files/v4.1/linuxptp-${PV}.tgz \
file://0001-include-string.h-for-strncpy.patch \
- file://systemd/phc2sys@.service \
- file://systemd/ptp4l@.service \
+ file://systemd/phc2sys@.service.in \
+ file://systemd/ptp4l@.service.in \
"
SRC_URI[md5sum] = "1db8699fc155965341759be5e5aad938"
@@ -22,14 +22,14 @@ UPSTREAM_CHECK_URI = "${LINUXPTP_SRC_URI}/files/"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
EXTRA_OEMAKE = "CC='${CC}' CROSS_COMPILE='${TARGET_PREFIX}' \
- EXTRA_CFLAGS='${CFLAGS}' mandir='${mandir}'"
+ EXTRA_CFLAGS='${CFLAGS}' mandir='${mandir}' sbindir='${sbindir}'"
export KBUILD_OUTPUT="${RECIPE_SYSROOT}"
LINUXPTP_SYSTEMD_SERVICES = "phc2sys@.service ptp4l@.service"
do_install() {
- oe_runmake install DESTDIR=${D} prefix=${prefix}
+ oe_runmake install DESTDIR=${D}
# Install example configs from source tree
install -d ${D}${docdir}/${PN}
@@ -44,7 +44,11 @@ do_install() {
# Install systemd services
install -d ${D}/${systemd_unitdir}/system/
for service in ${LINUXPTP_SYSTEMD_SERVICES}; do
- install -m 644 ${WORKDIR}/systemd/$service \
+ sed -i -e 's,@SBINDIR@,${sbindir},g' \
+ ${WORKDIR}/systemd/$service.in
+ sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+ ${WORKDIR}/systemd/$service.in
+ install -m 644 ${WORKDIR}/systemd/$service.in \
${D}/${systemd_unitdir}/system/$service
done
}
Use templates for the systemd services so that sbindir and sysconfdir can be written into them, improving portability. Pass sbindir with EXTRA_OEMAKE and remove 'prefix' which is redundant since we pass sbindir and mandir already. Signed-off-by: Luca Fancellu <luca.fancellu@arm.com> --- .../{phc2sys@.service => phc2sys@.service.in} | 2 +- .../systemd/{ptp4l@.service => ptp4l@.service.in} | 2 +- .../recipes-connectivity/linuxptp/linuxptp_4.1.bb | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) rename meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/{phc2sys@.service => phc2sys@.service.in} (85%) rename meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/{ptp4l@.service => ptp4l@.service.in} (73%)