Patchwork [meta-oe,V3,11/23] dropbear: remove unneeded systemd code / use ${systemd_unitdir}

login
register
mail settings
Submitter Andreas Müller
Date Feb. 23, 2012, 12:10 p.m.
Message ID <1329999054-23112-12-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/21671/
State Accepted
Commit 8998d3aae4db9d953c8c4a20150b4a90a71d082c
Headers show

Comments

Andreas Müller - Feb. 23, 2012, 12:10 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../dropbear/dropbear_2011.54.bbappend             |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

Patch

diff --git a/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
index 899e1fc..fc5d047 100644
--- a/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
+++ b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
@@ -1,6 +1,6 @@ 
 inherit systemd
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 # look for files in the layer first
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
@@ -13,14 +13,5 @@  SYSTEMD_PACKAGES = "${PN}-systemd"
 SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket"
 
 do_install_append() {
-	install -d ${D}${base_libdir}/systemd/system
-	install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${base_libdir}/systemd/system/
-	install -m 0644 ${WORKDIR}/dropbear@.service ${D}${base_libdir}/systemd/system/
-	install -m 0644 ${WORKDIR}/dropbear.socket ${D}${base_libdir}/systemd/system/
-	ln -sf /dev/null ${D}${base_libdir}/systemd/system/dropbear.service
+	ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service
 }
-
-PACKAGES += "${PN}-systemd"
-
-RDEPENDS_${PN}-systemd += "dropbear"
-FILES_${PN}-systemd = "${base_libdir}/systemd"