From: Camille Moncelier <moncelier@devlife.org>
Date: Sat, 6 Nov 2010 07:24:30 +0000 (+0000)
Subject: dropbear: Removed openmoko references. Added /etc/default/dropbear
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf67dc1bb16fca6d79753e12929b50f4073beabc;p=openembedded.git

dropbear: Removed openmoko references. Added /etc/default/dropbear

Signed-off-by: Camille Moncelier <moncelier@devlife.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/recipes/dropbear/dropbear.inc b/recipes/dropbear/dropbear.inc
index 1569ea33ea..1e25235cf9 100644
--- a/recipes/dropbear/dropbear.inc
+++ b/recipes/dropbear/dropbear.inc
@@ -6,7 +6,7 @@ DEPENDS = "zlib"
 PROVIDES = "ssh sshd"
 RPROVIDES_${PN} = "ssh sshd"
 
-INC_PR = "r5"
+INC_PR = "r6"
 
 SRC_URI = "\
   http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2 \
@@ -15,8 +15,6 @@ SRC_URI = "\
   file://fix-2kb-keys.patch \
   file://allow-nopw.patch;apply=no \
   file://init \
-"
-SRC_URI_append_openmoko = "\
   file://default \
 "
 
@@ -82,4 +80,4 @@ pkg_postrm_append () {
 	update-alternatives --remove scp ${bindir}/dropbearmulti
 }
 
-CONFFILES_${PN}_openmoko += "${sysconfdir}/default/dropbear"
+CONFFILES_${PN} += "${sysconfdir}/default/dropbear"
diff --git a/recipes/dropbear/dropbear/default b/recipes/dropbear/dropbear/default
new file mode 100644
index 0000000000..a4f2bfd3e4
--- /dev/null
+++ b/recipes/dropbear/dropbear/default
@@ -0,0 +1,4 @@
+# DROPBEAR_BANNER=""
+# DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key"
+# DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key"
+# DROPBEAR_KEYTYPES="rsa"