[oe-commits] Radek Dostal : lighttpd: lastest oe-core installs lighttpd. conf directly to /etc/

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 9ef0b3d45750ed65d8c26b8ce228376172de327c
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=9ef0b3d45750ed65d8c26b8ce228376172de327c

Author: Radek Dostal <rd at radekdostal.com>
Date:   Mon Apr 16 09:36:28 2012 +0000

lighttpd: lastest oe-core installs lighttpd.conf directly to /etc/

Signed-off-by: Radek Dostal <rd at radekdostal.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../lighttpd/lighttpd/lighttpd.service             |    2 +-
 .../lighttpd/lighttpd_1.4.30.bbappend              |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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