From: Noor <noor_ah...@mentor.com> * Enable lighttpd with systemd support. * Replace the hardcoded paths with sbindir, sysconfdir and base_bindir
Signed-off-by: Noor Ahsan <noor_ah...@mentor.com> --- .../lighttpd/files/lighttpd.service | 12 ++++++++++ meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 25 ++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service new file mode 100644 index 0000000..a5333b6 --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Lightning Fast Webserver With Light System Requirements +After=network.target + +[Service] +ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target + diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb index df6ce97..4e36772 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 file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ + file://lighttpd.service \ " SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b" @@ -39,19 +40,35 @@ EXTRA_OECONF = " \ --disable-static \ " -inherit autotools pkgconfig update-rc.d gettext +inherit autotools pkgconfig update-rc.d gettext systemd INITSCRIPT_NAME = "lighttpd" INITSCRIPT_PARAMS = "defaults 70" +SYSTEMD_SERVICE_${PN} = "lighttpd.service" +SYSTEMD_AUTO_ENABLE = "disable" + + do_install_append() { - install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var - install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + + install -d ${D}${sysconfdir} ${D}/www/logs ${D}/www/pages/dav ${D}/www/var 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','sysvinit','true','false',d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + fi + 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 + sed -i 's!/usr/sbin!${sbindir}!g' ${D}${systemd_unitdir}/system/lighttpd.service + sed -i 's!/etc!${sysconfdir}!g' ${D}${systemd_unitdir}/system/lighttpd.service + sed -i 's!/bin!${base_bindir}!g' ${D}${systemd_unitdir}/system/lighttpd.service + fi + } -FILES_${PN} += "${sysconfdir} /www" +FILES_${PN} += "${sysconfdir} /www ${systemd_unitdir}" CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" -- 1.7.9.5 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
