diff options
| author | Muhammad Shakeel <muhammad_shakeel@mentor.com> | 2013-09-04 11:05:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-10 23:13:49 +0100 |
| commit | 3ecb5e21b3b4f05f2d527264c3574fdc37984a77 (patch) | |
| tree | f4042ea41dee52fbc8e51a28b17cc77e2d7ffb87 | |
| parent | 36e3d63abaeafc5d2e671bad45b599c159ed10ab (diff) | |
| download | openembedded-core-3ecb5e21b3b4f05f2d527264c3574fdc37984a77.tar.gz openembedded-core-3ecb5e21b3b4f05f2d527264c3574fdc37984a77.tar.bz2 openembedded-core-3ecb5e21b3b4f05f2d527264c3574fdc37984a77.zip | |
rpcbind: Add systemd support
- Remove dependency on meta-systemd
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind/rpcbind.service | 14 | ||||
| -rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb | 16 |
3 files changed, 32 insertions, 1 deletions
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf new file mode 100644 index 0000000000..2a4dfbcfbc --- /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 0000000000..4de28d4ae1 --- /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=-@SYSCONFDIR@/rpcbind.conf +ExecStart=@SBINDIR@/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 be2897cdb4..a75e4e1bf6 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,11 @@ 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 -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_unitdir}/system/rpcbind.service } |