Patchwork [meta-oe,6/6] lighttpd: inherit systemd / remove unneded systemd code

login
mail settings
Submitter Andreas Müller
Date March 9, 2012, 10:13 a.m.
Message ID <1331288035-9678-6-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/22949/
State Accepted
Commit e0023c5a6eccdb20e0ecf892fcb5ecc7743b3b0b
Headers show

Comments

Andreas Müller - March 9, 2012, 10:13 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../lighttpd/lighttpd_1.4.30.bbappend              |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

Patch

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 b914405..5449b1a 100644
--- a/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
+++ b/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
@@ -1,16 +1,10 @@ 
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
  
-PRINC = "1"
+PRINC = "2"
 
-SRC_URI += "file://lighttpd.service"
-
-do_install_append() {
-	install -d ${D}${base_libdir}/systemd/systemd/
-	install -m 0644 ${WORKDIR}/lighttpd.service ${D}${base_libdir}/systemd/systemd/
+inherit systemd
 
-	install -d ${D}${base_libdir}/systemd/systemd/multi-user.target.wants
-	ln -sf ../lighttpd.service ${D}${base_libdir}/systemd/systemd/multi-user.target.wants
-}
-
-FILES_${PN} += "${base_libdir}/systemd"
+SRC_URI += "file://lighttpd.service"
 
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"