From dee376383721781118c6115a4593ad969e0830c1 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 17 Sep 2014 15:26:07 +0100 Subject: portmap: systemd support now in OE-Core Signed-off-by: Paul Eggleton --- .../recipes-connectivity/portmap/portmap/portmap.service | 10 ---------- .../oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend | 11 ----------- 2 files changed, 21 deletions(-) delete mode 100644 meta-systemd/oe-core/recipes-connectivity/portmap/portmap/portmap.service 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 cffb56c1d0..0000000000 --- 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 f13b51187c..6ce6e70d98 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 -} -- cgit v1.2.3-54-g00ecf