[oe-commits] Andreas Müller : dropbear: remove unneeded systemd code / use ${systemd_unitdir}

git at git.openembedded.org git at git.openembedded.org
Thu Feb 23 17:02:32 UTC 2012


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

Author: Andreas Müller <schnitzeltony at googlemail.com>
Date:   Thu Feb 16 02:03:03 2012 +0000

dropbear: remove unneeded systemd code / use ${systemd_unitdir}

Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../dropbear/dropbear_2011.54.bbappend             |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

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 at .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"





More information about the Openembedded-commits mailing list