[oe-commits] Koen Kooi : Revert "dropbear: Enable allow empty password patch."
git version control
git at git.openembedded.org
Fri Sep 4 09:43:56 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: eff28b3b4ec8309ac1d51d98b8bfc9f5d48ed43f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=eff28b3b4ec8309ac1d51d98b8bfc9f5d48ed43f
Author: Koen Kooi <koen at openembedded.org>
Date: Fri Sep 4 11:42:16 2009 +0200
Revert "dropbear: Enable allow empty password patch."
dropbear.inc needs the patch non-applied, see the thread in http://thread.gmane.org/gmane.comp.handhelds.openembedded/26302
This reverts commit c26fc5db90702b035bd545cff3ee7575a0f9b70f.
---
recipes/dropbear/dropbear-early_1.0.bb | 2 +-
recipes/dropbear/dropbear.inc | 4 +---
recipes/dropbear/dropbear_0.49.bb | 2 +-
recipes/dropbear/dropbear_0.51.bb | 3 ++-
recipes/dropbear/dropbear_0.52.bb | 3 ++-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/recipes/dropbear/dropbear-early_1.0.bb b/recipes/dropbear/dropbear-early_1.0.bb
index 3500670..c947cf0 100644
--- a/recipes/dropbear/dropbear-early_1.0.bb
+++ b/recipes/dropbear/dropbear-early_1.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
SECTION = "devel"
RDEPENDS = "dropbear"
-PR = "${INC_PR}.0"
+PR = "r3"
SRC_URI = "file://dropbear-early"
diff --git a/recipes/dropbear/dropbear.inc b/recipes/dropbear/dropbear.inc
index 2e3b7dd..364799f 100644
--- a/recipes/dropbear/dropbear.inc
+++ b/recipes/dropbear/dropbear.inc
@@ -6,14 +6,12 @@ DEPENDS = "zlib"
PROVIDES = "ssh sshd"
RPROVIDES = "ssh sshd"
-INC_PR = "r3"
-
SRC_URI = "\
http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2 \
file://urandom-xauth-changes-to-options.h.patch;patch=1 \
file://configure.patch;patch=1 \
file://fix-2kb-keys.patch;patch=1 \
- file://allow-nopw.patch;patch=1 \
+ file://allow-nopw.patch \
file://init \
"
SRC_URI_append_openmoko = "\
diff --git a/recipes/dropbear/dropbear_0.49.bb b/recipes/dropbear/dropbear_0.49.bb
index 9d45ea0..bf2f2ad 100644
--- a/recipes/dropbear/dropbear_0.49.bb
+++ b/recipes/dropbear/dropbear_0.49.bb
@@ -1,5 +1,5 @@
require dropbear.inc
-PR = "${INC_PR}.0"
+PR = "r2"
SRC_URI += "file://scp-argument-fix.patch;patch=1"
diff --git a/recipes/dropbear/dropbear_0.51.bb b/recipes/dropbear/dropbear_0.51.bb
index cdd312c..2566fbb 100644
--- a/recipes/dropbear/dropbear_0.51.bb
+++ b/recipes/dropbear/dropbear_0.51.bb
@@ -1,3 +1,4 @@
require dropbear.inc
-PR = "${INC_PR}.0"
+PR = "r1.01"
+
SRC_URI += "file://no-host-lookup.patch;patch=1"
diff --git a/recipes/dropbear/dropbear_0.52.bb b/recipes/dropbear/dropbear_0.52.bb
index 6130e50..6b2517b 100644
--- a/recipes/dropbear/dropbear_0.52.bb
+++ b/recipes/dropbear/dropbear_0.52.bb
@@ -1,5 +1,6 @@
require dropbear.inc
-PR = "${INC_PR}.0"
+PR = "r0"
+
SRC_URI += "file://no-host-lookup.patch;patch=1"
DEFAULT_PREFERENCE = "-1"
More information about the Openembedded-commits
mailing list