summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorMuhammad Shakeel <muhammad_shakeel@mentor.com>2013-09-04 11:05:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-10 23:15:15 +0100
commit1661f5c90afd6a7aeecc6ad450a7104fe2dd5f00 (patch)
treed17739c99ead8385e5e442b19546cd0a50c7eb4b /meta/recipes-extended
parentc6d25fbd3f65c3744a4778d68cac3795a6fb2970 (diff)
downloadpoky-1661f5c90afd6a7aeecc6ad450a7104fe2dd5f00.tar.gz
lighttpd: Add systemd support
- Remove dependency on meta-systemd (From OE-Core rev: 36e3d63abaeafc5d2e671bad45b599c159ed10ab) Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/lighttpd/files/lighttpd.service12
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb12
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 0000000000..66a907aa17
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
1[Unit]
2Description=Lightning Fast Webserver With Light System Requirements
3After=network.target
4
5[Service]
6ExecStartPre=@SBINDIR@/lighttpd -t -f @SYSCONFDIR@/lighttpd.conf
7ExecStart=@SBINDIR@/lighttpd -D -f @SYSCONFDIR@/lighttpd.conf
8ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
9
10[Install]
11WantedBy=multi-user.target
12
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index 6635e31167..c243494686 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -22,6 +22,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
22 file://index.html.lighttpd \ 22 file://index.html.lighttpd \
23 file://lighttpd.conf \ 23 file://lighttpd.conf \
24 file://lighttpd \ 24 file://lighttpd \
25 file://lighttpd.service \
25 " 26 "
26 27
27SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b" 28SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -39,16 +40,25 @@ EXTRA_OECONF = " \
39 --disable-static \ 40 --disable-static \
40" 41"
41 42
42inherit autotools pkgconfig update-rc.d gettext 43inherit autotools pkgconfig update-rc.d gettext systemd
43 44
44INITSCRIPT_NAME = "lighttpd" 45INITSCRIPT_NAME = "lighttpd"
45INITSCRIPT_PARAMS = "defaults 70" 46INITSCRIPT_PARAMS = "defaults 70"
46 47
48SYSTEMD_SERVICE_${PN} = "lighttpd.service"
49
47do_install_append() { 50do_install_append() {
48 install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var 51 install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var
49 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d 52 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
50 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} 53 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
51 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html 54 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
55
56 install -d ${D}${systemd_unitdir}/system
57 install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
58 sed -i -e 's,@SBINDIR@,${sbindir},g' \
59 -e 's,@SYSCONFDIR@,${sysconfdir},g' \
60 -e 's,@BASE_BINDIR@,${base_bindir},g' \
61 ${D}${systemd_unitdir}/system/lighttpd.service
52} 62}
53 63
54FILES_${PN} += "${sysconfdir} /www" 64FILES_${PN} += "${sysconfdir} /www"