[oe-commits] Andreas Müller : openssh: remove unneeded systemd code

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: 54a836cb0f33391252627ef8b7d0668d5de87b81
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=54a836cb0f33391252627ef8b7d0668d5de87b81

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

openssh: remove unneeded systemd code

Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
Acked-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../openssh/openssh_5.9p1.bbappend                 |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/meta-oe/recipes-connectivity/openssh/openssh_5.9p1.bbappend b/meta-oe/recipes-connectivity/openssh/openssh_5.9p1.bbappend
index 3f68e09..de7668f 100644
--- a/meta-oe/recipes-connectivity/openssh/openssh_5.9p1.bbappend
+++ b/meta-oe/recipes-connectivity/openssh/openssh_5.9p1.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 SYSTEMD_PACKAGES = "openssh-sshd-systemd"
 SYSTEMD_SERVICE = "sshd.socket"
@@ -8,15 +8,3 @@ SYSTEMD_SERVICE = "sshd.socket"
 inherit systemd
 
 SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service"
-
-do_install_append() {
-       install -d ${D}${base_libdir}/systemd/system
-       install -m 644 ${WORKDIR}/sshd.socket ${D}${base_libdir}/systemd/system
-       install -m 644 ${WORKDIR}/sshd at .service ${D}${base_libdir}/systemd/system
-       install -m 644 ${WORKDIR}/sshdgenkeys.service ${D}${base_libdir}/systemd/system
-}
-
-PACKAGES =+ "openssh-sshd-systemd"
-
-FILES_openssh-sshd-systemd += "${base_libdir}/systemd"
-RDEPENDS_openssh-sshd-systemd += "openssh-sshd"





More information about the Openembedded-commits mailing list