Patchwork [meta-oe,v2] 09/22] dropbear: remove unneeded systemd code

login
register
mail settings
Submitter Andreas Müller
Date Feb. 16, 2012, 2:03 a.m.
Message ID <1329357796-27398-10-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/21317/
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>
---
 .../dropbear/dropbear_2011.54.bbappend             |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
Otavio Salvador - Feb. 16, 2012, 10:05 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>
> ---
>  .../dropbear/dropbear_2011.54.bbappend             |   11 +----------
>  1 files changed, 1 insertions(+), 10 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..96cc8bd 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
>  }
> -
> -PACKAGES += "${PN}-systemd"
> -
> -RDEPENDS_${PN}-systemd += "dropbear"
> -FILES_${PN}-systemd = "${base_libdir}/systemd"
> --
> 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-core/dropbear/dropbear_2011.54.bbappend b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
index 899e1fc..96cc8bd 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
 }
-
-PACKAGES += "${PN}-systemd"
-
-RDEPENDS_${PN}-systemd += "dropbear"
-FILES_${PN}-systemd = "${base_libdir}/systemd"