From patchwork Mon Sep 22 06:09:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Kim_B=C3=B8ndergaard?= X-Patchwork-Id: 391794 X-Patchwork-Delegate: kiho@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 5F07B14019D for ; Mon, 22 Sep 2014 16:10:09 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 126DB4001C for ; Mon, 22 Sep 2014 08:10:03 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id EE24D3FF54 for ; Mon, 22 Sep 2014 08:09:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1325; q=dns/txt; s=ironport1; t=1411366198; x=1442902198; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Zv51nTpIQfoUBTmcdRLZT7kPwkWwKp6lmeiefW/PQBE=; b=Ax7mN3YrC2LPtYQzgGwtPBFBNF8TDYiIyH/LlWiKjHMkLs9RzaAh6F0x xOuaTBrL34Ca+FNGVgCds4eDR2f1ZMB6UCBu1vBz2Mtj+EO8+DFTdcR4F 62srsd05MxC8vWZgGtBgu/FSPWzSBxJvye3coMmzNtywFHRBxgSVwuAzX o=; X-IronPort-AV: E=Sophos;i="5.04,570,1406584800"; d="scan'208";a="5106686" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 22 Sep 2014 08:09:57 +0200 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Mon, 22 Sep 2014 08:09:57 +0200 Received: by localhost (Postfix, from userid 30019) id 02EF26837EC; Mon, 22 Sep 2014 06:09:55 +0000 (UTC) From: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= To: Subject: [PATCH 7/7] lighttpd: Fixed sysvinit and split into overridable conf package Date: Mon, 22 Sep 2014 06:09:54 +0000 Message-ID: <474625899e021214d58e991df34049047e1799e0.1411365801.git.kibo@prevas.dk> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 Cc: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Kim Bøndergaard --- recipes/lighttpd/lighttpd.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipes/lighttpd/lighttpd.inc b/recipes/lighttpd/lighttpd.inc index 8b55816..bbafd3c 100644 --- a/recipes/lighttpd/lighttpd.inc +++ b/recipes/lighttpd/lighttpd.inc @@ -81,10 +81,11 @@ DEPENDS_SSL:USE_lighttpd_ssl = "libssl libcrypto" DEPENDS += "${DEPENDS_SSL}" RDEPENDS_${PN} += "${DEPENDS_SSL}" +RECIPE_FLAGS += "lighttpd_sysvinit_start" DEFAULT_USE_lighttpd_sysvinit_start = "70" DEFAULT_USE_lighttpd_sysvinit_stop = "0" SYSVINIT_SCRIPT_lighttpd = "lighttpd" -do_install[postfuncs] += " do_install_lighttpd_extra" +do_install[postfuncs] =+ " do_install_lighttpd_extra" do_install_lighttpd_extra() { install -d ${D}${sysconfdir}/init.d \ ${D}/www/logs ${D}/www/pages/dav ${D}/www/var @@ -93,7 +94,13 @@ do_install_lighttpd_extra() { install -m 0644 ${SRCDIR}/index.html ${D}/www/pages/ } -FILES_${PN} += "${sysconfdir} /www" +PACKAGES =+ "${PN}-conf" +FILES_${PN} += "${sysconfdir}" FILES_${PN} += "${libdir}/mod_*" +FILES_${PN} += "/www" +FILES_${PN}-conf = "${sysconfdir}/lighttpd.conf" +FILES_${PN}-conf += "/www/pages/index.html" RDEPENDS_${PN} += "libc libgcc libdl libm" + +