summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-06-01 15:08:02 +0100
committerJoshua Lock <josh@linux.intel.com>2010-06-01 15:17:12 +0100
commit7f0181202a051bdfe378471546d9073bc7274e06 (patch)
treea1883ca395d293cb67e35f407867422b5b76d749 /meta
parente2598fefaabfdb90c90997246ff23cef89cc99f0 (diff)
downloadpoky-7f0181202a051bdfe378471546d9073bc7274e06.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/dropbear/dropbear.inc10
-rw-r--r--meta/packages/dropbear/dropbear_0.49.bb2
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/packages/dropbear/dropbear.inc b/meta/packages/dropbear/dropbear.inc
index 822360d6a1..7f5dbe356b 100644
--- a/meta/packages/dropbear/dropbear.inc
+++ b/meta/packages/dropbear/dropbear.inc
@@ -7,11 +7,11 @@ PROVIDES = "ssh sshd"
7RPROVIDES = "ssh sshd" 7RPROVIDES = "ssh sshd"
8 8
9SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ 9SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
10 file://urandom-xauth-changes-to-options.h.patch;patch=1 \ 10 file://urandom-xauth-changes-to-options.h.patch \
11 file://configure.patch;patch=1 \ 11 file://configure.patch \
12 file://fix-2kb-keys.patch;patch=1 \ 12 file://fix-2kb-keys.patch \
13 file://allow-nopw.patch \ 13 file://allow-nopw.patch;apply=no \
14 file://init" 14 file://init"
15 15
16inherit autotools update-rc.d 16inherit autotools update-rc.d
17 17
diff --git a/meta/packages/dropbear/dropbear_0.49.bb b/meta/packages/dropbear/dropbear_0.49.bb
index e1e112f2da..929eeb8174 100644
--- a/meta/packages/dropbear/dropbear_0.49.bb
+++ b/meta/packages/dropbear/dropbear_0.49.bb
@@ -1,3 +1,3 @@
1require dropbear.inc 1require dropbear.inc
2 2
3PR="r1" 3PR="r2"