Patchwork [meta-oe,meta-systemd,2/3] lighttpd: Remove systemd support which is merged in oe-core

login
register
mail settings
Submitter Shakeel, Muhammad
Date Sept. 12, 2013, 3:28 p.m.
Message ID <5edd378abcccf73276f64602d1b8dcc19cd9aaf1.1378998806.git.muhammad_shakeel@mentor.com>
Download mbox | patch
Permalink /patch/57895/
State Accepted, archived
Headers show

Comments

Shakeel, Muhammad - Sept. 12, 2013, 3:28 p.m.
OE-Core has been updated to support lighttpd with systemd. Stuff here is
not required anymore.

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
 .../lighttpd/lighttpd/lighttpd.service             |   13 -------------
 .../lighttpd/lighttpd_1.4.32.bbappend              |   15 ---------------
 2 files changed, 28 deletions(-)
 delete mode 100644 meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service

Patch

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..f006b3f 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,3 @@ 
-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
-}
-