dropbear: apply scp-argument-fix.patch to version 0.49 only. reorder some fields...

* commit and cosmetic changes by Laibsch

diff --git a/packages/dropbear/dropbear-early_1.0.bb b/packages/dropbear/dropbear-early_1.0.bb
index df2c2dc26f97e5155e7ff1537ba5c2ddcd0f56dc..c947cf0e747c9c5b4237f3712718ba70e6bccd72 100644 (file)
--- a/packages/dropbear/dropbear-early_1.0.bb
+++ b/packages/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"
-PR = "r2"
 RDEPENDS = "dropbear"
+PR = "r3"
 
 SRC_URI = "file://dropbear-early"
 

diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc
index 00e5eec2cec2c3392333e5025fc8867e7a36c388..ebe0c1ea9c57f181d64aa3169cd200054dcabc47 100644 (file)
--- a/packages/dropbear/dropbear.inc
+++ b/packages/dropbear/dropbear.inc
@@ -10,7 +10,6 @@ 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://scp-argument-fix.patch;patch=1 \
           file://allow-nopw.patch \
           file://init"
 

diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb
index 0ed386ca0c0a154987780dbbb9ede9ebdcf2d92a..bf2f2add601dfdbdb175cb7905d40378fd527be3 100644 (file)
--- a/packages/dropbear/dropbear_0.49.bb
+++ b/packages/dropbear/dropbear_0.49.bb
@@ -1,3 +1,5 @@
-PR = "r1"
-
 require dropbear.inc
+
+PR = "r2"
+
+SRC_URI += "file://scp-argument-fix.patch;patch=1"

diff --git a/packages/dropbear/dropbear_0.50.bb b/packages/dropbear/dropbear_0.50.bb
index 21d46ef59c328f594e1f5bf0f95b83959c6394a1..bd8f31cff66ac8a335e28fb6db7c771bc38cc817 100644 (file)
--- a/packages/dropbear/dropbear_0.50.bb
+++ b/packages/dropbear/dropbear_0.50.bb
@@ -1,6 +1,6 @@
-PR = "r0"
-
 require dropbear.inc
 
+PR = "r1"
+
 # testing
 DEFAULT_PREFERENCE = "-1"