[PATCH 0/2] portmap: fixes for sysvinit and systemd

[PATCH 0/2] portmap: fixes for sysvinit and systemd

[Chen Qi]

The following changes since commit 10df0718d6a626d99beb68cde8d914ee0820d7eb:

  classes/populate_sdk_base: enable adding custom commands to SDK install script (2014-09-11 17:44:40 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib ChenQi/portmap-systemd
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/portmap-systemd

Chen Qi (2):
  portmap: fix INITSCRIPT_PARAMS
  portmap: add systemd service file

 meta/recipes-connectivity/portmap/portmap.inc             |  7 +++++--
 meta/recipes-connectivity/portmap/portmap/portmap.service | 10 ++++++++++
 meta/recipes-connectivity/portmap/portmap_6.0.bb          |  7 ++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-connectivity/portmap/portmap/portmap.service

-- 
1.9.1

[PATCH 1/2] portmap: fix INITSCRIPT_PARAMS

[Chen Qi]

Fix portmap init to make it run at runlevel 2,3,4,5.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-connectivity/portmap/portmap.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/portmap/portmap.inc b/meta/recipes-connectivity/portmap/portmap.inc
index 7588341..9b42859 100644
--- a/meta/recipes-connectivity/portmap/portmap.inc
+++ b/meta/recipes-connectivity/portmap/portmap.inc
@@ -13,7 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
 S = "${WORKDIR}/portmap_5beta"
 
 INITSCRIPT_NAME = "portmap"
-INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
+INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ."
 
 inherit update-rc.d
 
-- 
1.9.1

[PATCH 2/2] portmap: add systemd service file

[Chen Qi]

Add systemd service file for systemd support.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-connectivity/portmap/portmap.inc             |  5 ++++-
 meta/recipes-connectivity/portmap/portmap/portmap.service | 10 ++++++++++
 meta/recipes-connectivity/portmap/portmap_6.0.bb          |  7 ++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/portmap/portmap/portmap.service

diff --git a/meta/recipes-connectivity/portmap/portmap.inc b/meta/recipes-connectivity/portmap/portmap.inc
index 9b42859..f5f7fde 100644
--- a/meta/recipes-connectivity/portmap/portmap.inc
+++ b/meta/recipes-connectivity/portmap/portmap.inc
@@ -10,12 +10,15 @@ SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
 	${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz \
 	file://portmap.init \
 	file://make.patch;apply=yes"
+
 S = "${WORKDIR}/portmap_5beta"
 
 INITSCRIPT_NAME = "portmap"
 INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ."
 
-inherit update-rc.d
+inherit update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "portmap.service"
 
 sbindir = "/sbin"
 
diff --git a/meta/recipes-connectivity/portmap/portmap/portmap.service b/meta/recipes-connectivity/portmap/portmap/portmap.service
new file mode 100644
index 0000000..7ef9d7b
--- /dev/null
+++ b/meta/recipes-connectivity/portmap/portmap/portmap.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The RPC portmapper
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=@BASE_SBINDIR@/portmap
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/portmap/portmap_6.0.bb b/meta/recipes-connectivity/portmap/portmap_6.0.bb
index b0a9454..8b65a03 100644
--- a/meta/recipes-connectivity/portmap/portmap_6.0.bb
+++ b/meta/recipes-connectivity/portmap/portmap_6.0.bb
@@ -5,7 +5,8 @@ PR = "r9"
 SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
            file://destdir-no-strip.patch \
            file://tcpd-config.patch \
-           file://portmap.init"
+           file://portmap.init \
+           file://portmap.service"
 
 SRC_URI[md5sum] = "ac108ab68bf0f34477f8317791aaf1ff"
 SRC_URI[sha256sum] = "02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de"
@@ -23,4 +24,8 @@ fakeroot do_install() {
     install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
     oe_runmake install DESTDIR=${D}
+
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_unitdir}/system
+    sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g' ${D}${systemd_unitdir}/system/portmap.service
 }
-- 
1.9.1