From: Armin Kuster <akuster808@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 06/14] opensaf: remove unused service file
Date: Mon, 14 Dec 2015 07:33:59 -0800 [thread overview]
Message-ID: <c33de7f7223ad97e9647215f90e0a5aab8f3b0ac.1450027640.git.akuster808@gmail.com> (raw)
In-Reply-To: <cover.1450027640.git.akuster808@gmail.com>
In-Reply-To: <cover.1450027640.git.akuster808@gmail.com>
From: Li Xin <lixin.fnst@cn.fujitsu.com>
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../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
next prev parent reply other threads:[~2015-12-14 15:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-14 15:33 [PATCH 00/14] mete-oe Jethro-next Armin Kuster
2015-12-14 15:33 ` [PATCH 01/14] netcat: add DESCRIPTION Armin Kuster
2015-12-14 15:33 ` [PATCH 02/14] netcat-openbsd: replace patch with quilt Armin Kuster
2015-12-14 15:33 ` [PATCH 03/14] net-snmp: Modify snmpd.service Armin Kuster
2015-12-14 15:33 ` [PATCH 04/14] net-snmp: fix cross compilation Armin Kuster
2015-12-14 16:26 ` Martin Jansa
2015-12-14 18:56 ` akuster808
2015-12-15 0:27 ` akuster808
2015-12-14 15:33 ` [PATCH 05/14] ypbind-mt: set path of ypdomainname in ypbind script Armin Kuster
2015-12-14 15:33 ` Armin Kuster [this message]
2015-12-14 15:34 ` [PATCH 07/14] lldpd: configure the systemd unit file dir Armin Kuster
2015-12-14 15:34 ` [PATCH 08/14] ctdb: rdep on bash Armin Kuster
2015-12-14 15:34 ` [PATCH 09/14] netmap-modules: make deterministic builds for drivers Armin Kuster
2015-12-14 15:34 ` [PATCH 10/14] netmap-modules: Modules may not have the same arch as userspace Armin Kuster
2015-12-14 15:34 ` [PATCH 11/14] ufw: improve RRECOMMENDS Armin Kuster
2015-12-14 15:34 ` [PATCH 12/14] dovecot: add PACKAGECONFIG for lz4 Armin Kuster
2015-12-14 15:34 ` [PATCH 13/14] pure-ftpd: add PACKAGECONFIG for libsodium Armin Kuster
2015-12-14 15:34 ` [PATCH 14/14] tmux: Fix QA issue Armin Kuster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c33de7f7223ad97e9647215f90e0a5aab8f3b0ac.1450027640.git.akuster808@gmail.com \
--to=akuster808@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.