From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gemini.alm.mentorg.com (nat-lmt.mentorg.com [139.181.28.34]) by mail.openembedded.org (Postfix) with ESMTP id 12F086B3B3 for ; Thu, 1 Aug 2013 11:43:08 +0000 (UTC) Received: from pkl-mshakeel-ubuntu.mgc.mentorg.com ([137.202.157.119]) by gemini.alm.mentorg.com (8.14.4/8.14.4) with ESMTP id r71Bgwhg031900; Thu, 1 Aug 2013 06:43:08 -0500 From: "Shakeel, Muhammad" To: openembedded-core@lists.openembedded.org Date: Thu, 1 Aug 2013 16:43:20 +0500 Message-Id: <1375357402-10147-2-git-send-email-muhammad_shakeel@mentor.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1375357402-10147-1-git-send-email-muhammad_shakeel@mentor.com> References: <1375357402-10147-1-git-send-email-muhammad_shakeel@mentor.com> Subject: [PATCH 2/4] lighttpd: Add systemd support X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Aug 2013 11:43:09 -0000 From: Muhammad Shakeel - Remove dependency on meta-systemd Signed-off-by: Muhammad Shakeel --- .../lighttpd/files/lighttpd.service | 12 ++++++++++++ meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 2 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..f473632 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,28 @@ 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 -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html + + 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 } -FILES_${PN} += "${sysconfdir} /www" +FILES_${PN} += "${sysconfdir} /www ${systemd_unitdir}" CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" -- 1.7.9.5