summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-daemons
diff options
context:
space:
mode:
authorLi Xin <lixin.fnst@cn.fujitsu.com>2015-11-02 14:10:19 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2015-11-30 12:55:54 -0500
commitddbbcf93c15197226d7952fc662c6e34c0def21a (patch)
tree0731373c713ffd70540a875173c0b4bd10683586 /meta-networking/recipes-daemons
parentb6d4390d7b9a0b7ef14879e0ddd6ea2a3114e530 (diff)
downloadmeta-openembedded-ddbbcf93c15197226d7952fc662c6e34c0def21a.tar.gz
opensaf: remove unused service file
Upstream ships systemd service file plmcboot.service and plmcd.service now, so we don't need this anymore. Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-daemons')
-rw-r--r--meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service13
-rw-r--r--meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service15
-rw-r--r--meta-networking/recipes-daemons/opensaf/opensaf_4.6.0.bb6
3 files changed, 1 insertions, 33 deletions
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 76ec73af9..000000000
--- a/meta-networking/recipes-daemons/opensaf/opensaf/plmcboot.service
+++ /dev/null
@@ -1,13 +0,0 @@
1[Unit]
2Description=PLMCBOOT Program
3After=network.target
4ConditionPathExists=@SYSCONFDIR@/plmcd.conf
5
6[Service]
7Type=oneshot
8ExecStart=@SBINDIR@/plmcd -c @SYSCONFDIR@/plmcd.conf -s
9ExecStop=@SBINDIR@/plmcd -c @SYSCONFDIR@/plmcd.conf -x
10RemainAfterExit=yes
11
12[Install]
13WantedBy=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 1d48e7764..000000000
--- a/meta-networking/recipes-daemons/opensaf/opensaf/plmcd.service
+++ /dev/null
@@ -1,15 +0,0 @@
1[Unit]
2Description=Plmcd Daemon
3Requires=plmcboot.service
4After=network.target plmcboot.service
5ConditionPathExists=@SYSCONFDIR@/plmcd.conf
6
7[Service]
8Type=forking
9ExecStart=@SBINDIR@/plmcd -c @SYSCONFDIR@/plmcd.conf
10ExecStartPost=/bin/touch /var/lock/subsys/plmcd
11ExecStopPost=/bin/rm -rf /var/lock/subsys/plmcd
12PIDFile=/var/run/plmcd.pid
13
14[Install]
15WantedBy=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 28f4c006d..908452426 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
15 15
16SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ 16SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \
17 file://install-samples-from-srcdir.patch \ 17 file://install-samples-from-srcdir.patch \
18 file://plmcd.service \
19 file://plmcboot.service \
20 file://0001-plmcd-error-fix.patch \ 18 file://0001-plmcd-error-fix.patch \
21 file://Revert_imma_client_node_replyPending_to_unsigned_char.patch \ 19 file://Revert_imma_client_node_replyPending_to_unsigned_char.patch \
22 file://Fix_GCC_5.1.0_compiler_warning.patch \ 20 file://Fix_GCC_5.1.0_compiler_warning.patch \
@@ -65,8 +63,6 @@ do_install_append() {
65 install -d ${D}${systemd_unitdir}/system 63 install -d ${D}${systemd_unitdir}/system
66 install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \ 64 install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \
67 ${D}${systemd_unitdir}/system 65 ${D}${systemd_unitdir}/system
68 install -m 644 ${WORKDIR}/plmc*.service ${D}/${systemd_unitdir}/system 66 install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system
69 sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/plmc*.service
70 sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/plmc*.service
71 67
72} 68}