Patchwork [meta-oe,meta-efl,3/3] lighttpd: lastest oe-core installs lighttpd.conf directly to /etc/

login
mail settings
Submitter Martin Jansa
Date April 16, 2012, 9:36 a.m.
Message ID <b71bfc587af9ec4db178f900457e0de8cef418ba.1334568930.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/25909/
State Accepted
Commit 9ef0b3d45750ed65d8c26b8ce228376172de327c
Headers show

Comments

Martin Jansa - April 16, 2012, 9:36 a.m.
From: Radek Dostal <rd@radekdostal.com>

Signed-off-by: Radek Dostal <rd@radekdostal.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../lighttpd/lighttpd/lighttpd.service             |    2 +-
 .../lighttpd/lighttpd_1.4.30.bbappend              |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service b/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service
index 18b752f..f4564f3 100644
--- a/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service
+++ b/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service
@@ -5,7 +5,7 @@  After=syslog.target
 [Service]
 Type=oneshot
 EnvironmentFile=-/etc/sysconfig/lighttpd
-ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
 RemainAfterExit=yes
 
 [Install]
diff --git a/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend b/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
index 5449b1a..1341405 100644
--- a/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
+++ b/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
@@ -1,6 +1,6 @@ 
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
- 
-PRINC = "2"
+
+PRINC := "${@int(PRINC) + 3}"
 
 inherit systemd