[oe-commits] Paul Eggleton : portmap: systemd support now in OE-Core

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: dee376383721781118c6115a4593ad969e0830c1
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=dee376383721781118c6115a4593ad969e0830c1

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Wed Sep 17 15:26:07 2014 +0100

portmap: systemd support now in OE-Core

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 .../recipes-connectivity/portmap/portmap/portmap.service      | 10 ----------
 .../oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend | 11 -----------
 2 files changed, 21 deletions(-)

diff --git a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap/portmap.service b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap/portmap.service
deleted file mode 100644
index cffb56c..0000000
--- a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap/portmap.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Portmap
-
-[Service]
-Type=oneshot
-ExecStart=/sbin/portmap -l
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
index f13b511..6ce6e70 100644
--- a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
@@ -1,16 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-
-inherit systemd
-
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "portmap.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-SRC_URI_append = " file://portmap.service"
-
-do_install_append() {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_unitdir}/system
-}