From: Li Xin <[email protected]> Upstream ships systemd service file plmcboot.service and plmcd.service now, so we don't need this anymore.
Signed-off-by: Li Xin <[email protected]> Signed-off-by: Martin Jansa <[email protected]> Signed-off-by: Joe MacDonald <[email protected]> Signed-off-by: Armin Kuster <[email protected]> --- .../recipes-daemons/opensaf/opensaf/plmcboot.service | 13 ------------- .../recipes-daemons/opensaf/opensaf/plmcd.service | 15 --------------- meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb | 6 +----- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service b/meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service deleted file mode 100644 index 76ec73a..0000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=PLMCBOOT Program -After=network.target -ConditionPathExists=@SYSCONFDIR@/plmcd.conf - -[Service] -Type=oneshot -ExecStart=@SBINDIR@/plmcd -c @SYSCONFDIR@/plmcd.conf -s -ExecStop=@SBINDIR@/plmcd -c @SYSCONFDIR@/plmcd.conf -x -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service b/meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service deleted file mode 100644 index 1d48e77..0000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Plmcd Daemon -Requires=plmcboot.service -After=network.target plmcboot.service -ConditionPathExists=@SYSCONFDIR@/plmcd.conf - -[Service] -Type=forking -ExecStart=@SBINDIR@/plmcd -c @SYSCONFDIR@/plmcd.conf -ExecStartPost=/bin/touch /var/lock/subsys/plmcd -ExecStopPost=/bin/rm -rf /var/lock/subsys/plmcd -PIDFile=/var/run/plmcd.pid - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb b/meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb index 28f4c00..9084524 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb @@ -15,8 +15,6 @@ inherit autotools useradd systemd pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://install-samples-from-srcdir.patch \ - file://plmcd.service \ - file://plmcboot.service \ file://0001-plmcd-error-fix.patch \ file://Revert_imma_client_node_replyPending_to_unsigned_char.patch \ file://Fix_GCC_5.1.0_compiler_warning.patch \ @@ -65,8 +63,6 @@ do_install_append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \ ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/plmc*.service ${D}/${systemd_unitdir}/system - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/plmc*.service - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/plmc*.service + install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system } -- 1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
