Patchwork [3/4,v2] rpcbind: Add systemd support

login
register
mail settings
Submitter Shakeel, Muhammad
Date Aug. 12, 2013, 3:18 p.m.
Message ID <1376320691-20541-3-git-send-email-muhammad_shakeel@mentor.com>
Download mbox | patch
Permalink /patch/55481/
State New
Headers show

Comments

Shakeel, Muhammad - Aug. 12, 2013, 3:18 p.m.
From: Muhammad Shakeel <muhammad_shakeel@mentor.com>

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
 meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf |    3 +++
 .../rpcbind/rpcbind/rpcbind.service                |   14 ++++++++++++++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb     |   15 ++++++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
new file mode 100644
index 0000000..2a4dfbc
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
@@ -0,0 +1,3 @@ 
+# Optional arguments passed to rpcbind.
+#
+RPCBIND_OPTS=""
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 0000000..fa217b9
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,14 @@ 
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/rpcbind.conf
+ExecStart=/usr/sbin/rpcbind -w $RPCBIND_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index f4a0367..264c50c 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,8 @@  SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
            file://fix_host_path.patch \
            file://obsolete_automake_macros.patch \
            ${UCLIBCPATCHES} \
+           file://rpcbind.conf \
+           file://rpcbind.service \
           "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +29,7 @@  SRC_URI[sha256sum] = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
 
 PR = "r4"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,6 +37,11 @@  PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
+EXTRA_OECONF += " --enable-warmstarts "
+
 do_install_append () {
     mv ${D}${bindir} ${D}${sbindir}
 
@@ -43,4 +50,10 @@  do_install_append () {
         -e 's,/sbin/,${sbindir}/,g' \
         ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
     chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+
+    install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+    sed -i 's,/usr/sbin,${sbindir},g' ${D}${systemd_unitdir}/system/rpcbind.service
+    sed -i 's,/etc,${sysconfdir},g' ${D}${systemd_unitdir}/system/rpcbind.service
 }