[oe-commits] Shakeel, Muhammad : lighttpd: Remove systemd support which is merged in oe-core

[git at git.openembedded.org]

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

Author: Shakeel, Muhammad <muhammad_shakeel at mentor.com>
Date:   Thu Sep 12 15:28:53 2013 +0000

lighttpd: Remove systemd support which is merged in oe-core

OE-Core has been updated to support lighttpd with systemd. Stuff here is
not required anymore.

Signed-off-by: Muhammad Shakeel <muhammad_shakeel at mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../lighttpd/lighttpd/lighttpd.service             |   13 -------------
 .../lighttpd/lighttpd_1.4.32.bbappend              |   13 -------------
 2 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service
deleted file mode 100644
index f4564f3..0000000
--- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Lightning Fast Webserver With Light System Requirements
-After=syslog.target
-
-[Service]
-Type=oneshot
-EnvironmentFile=-/etc/sysconfig/lighttpd
-ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
index 96fa989..5cb6bf4 100644
--- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
+++ b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
@@ -1,18 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
 PRINC := "${@int(PRINC) + 2}"
 
-inherit systemd
-
-SRC_URI += "file://lighttpd.service"
-
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "lighttpd.service"
-
-do_install_append() {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
-}
-