dropbear: don't apply no-password patch

The patch.bbclass changes default to applying listed patches without an
apply/patch parameter. Set the apply parameter to no.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/packages/dropbear/dropbear.inc b/meta/packages/dropbear/dropbear.inc
index 822360d6a101bdbeb0df2e6693d2901dce21f3a2..7f5dbe356b2f4bdd6cdd861a9f84652c5b6e42db 100644 (file)
--- a/meta/packages/dropbear/dropbear.inc
+++ b/meta/packages/dropbear/dropbear.inc
@@ -7,11 +7,11 @@ PROVIDES = "ssh sshd"
 RPROVIDES = "ssh sshd"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
-          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 \
-          file://init"
+                file://urandom-xauth-changes-to-options.h.patch \
+                file://configure.patch \
+                file://fix-2kb-keys.patch \
+                file://allow-nopw.patch;apply=no \
+                file://init"
 
 inherit autotools update-rc.d
 

diff --git a/meta/packages/dropbear/dropbear_0.49.bb b/meta/packages/dropbear/dropbear_0.49.bb
index e1e112f2da8a518b9b27569bdba3ec8f9357aa98..929eeb81744c4d182cec90451bdebb72e856f534 100644 (file)
--- a/meta/packages/dropbear/dropbear_0.49.bb
+++ b/meta/packages/dropbear/dropbear_0.49.bb
@@ -1,3 +1,3 @@
 require dropbear.inc
 
-PR="r1"
+PR="r2"