[OE-core] [PATCH] [dylan] lighttpd: Enabling with systemd

[Shakeel, Muhammad]

Hi Saul,

Can you please comment on the status of this patch? Can it be merged to master branch only?

I guess Martin is also working to move systemd-layer related changes into oe-core for 1.5 release and he has already updated some recipes. Should I consult him regarding this kind of changes?

Best Regards,
Shakeel
________________________________________
From: Shakeel, Muhammad
Sent: Wednesday, June 19, 2013 9:49 PM
To: openembedded-core at lists.openembedded.org
Cc: Shakeel, Muhammad
Subject: [PATCH] [dylan] lighttpd: Enabling with systemd

From: Muhammad Shakeel <muhammad_shakeel at mentor.com>

- Remove dependency on systemd layer
- Use lighttpd service type 'simple' rather than 'oneshot'

Signed-off-by: Muhammad Shakeel <muhammad_shakeel at mentor.com>
---
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..d73a76a 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -5,7 +5,6 @@ BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"

-
 SECTION = "net"
 DEPENDS = "zlib libpcre"
 RDEPENDS_${PN} += " \
@@ -18,10 +17,15 @@ RDEPENDS_${PN} += " \

 PR = "r0"

+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
 SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
         file://index.html.lighttpd \
         file://lighttpd.conf \
         file://lighttpd \
+        file://lighttpd.service \
         "

 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -49,6 +53,11 @@ do_install_append() {
     install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
     install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+    if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
+    fi
 }

 FILES_${PN} += "${sysconfdir} /www"
--
1.7.9.5