Patchwork [meta-oe,v2] 10/22] openssh: remove unneeded systemd code

login
register
mail settings
Submitter Andreas Müller
Date Feb. 16, 2012, 2:03 a.m.
Message ID <1329357796-27398-11-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/21327/
State Superseded, archived
Headers show

Comments

Andreas Müller - Feb. 16, 2012, 2:03 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../openssh/openssh_5.9p1.bbappend                 |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)
Otavio Salvador - Feb. 16, 2012, 10:06 a.m.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>

On Thu, Feb 16, 2012 at 00:03, Andreas Müller
<schnitzeltony@googlemail.com>wrote:

>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../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@.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"
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

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