summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-06-20 19:01:13 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 12:07:32 +0100
commitda7a1b4e08eb70ea43bb8638bb9d255f6ff82836 (patch)
tree03dcb083db5d909f02bdcaf4cdfacb9ff2e7ea56
parentc425c3804cabafaa7ff8435f56b82349699afffc (diff)
downloadpoky-da7a1b4e08eb70ea43bb8638bb9d255f6ff82836.tar.gz
dropbear: Don't patch in configure
We need to avoid applying a patch in configure, because a rebuild could trigger this, without triggering do_patch. (From OE-Core rev: 16fbdaa24fd4add37c1e873505f55bcef5695a94) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc4
-rw-r--r--meta/recipes-core/dropbear/dropbear_0.52.bb2
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index e9290ff9a7..c9c41d2117 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -32,13 +32,15 @@ EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
32 32
33DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" 33DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
34 34
35do_configure_prepend() { 35do_debug_patch() {
36 if [ "${DISTRO_TYPE}" = "debug" ]; then 36 if [ "${DISTRO_TYPE}" = "debug" ]; then
37 bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!" 37 bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!"
38 patch -p1 < ${WORKDIR}/allow-nopw.patch 38 patch -p1 < ${WORKDIR}/allow-nopw.patch
39 fi 39 fi
40} 40}
41 41
42addtask do_debug_patch after do_patch before do_configure
43
42do_install() { 44do_install() {
43 install -d ${D}${sysconfdir} \ 45 install -d ${D}${sysconfdir} \
44 ${D}${sysconfdir}/init.d \ 46 ${D}${sysconfdir}/init.d \
diff --git a/meta/recipes-core/dropbear/dropbear_0.52.bb b/meta/recipes-core/dropbear/dropbear_0.52.bb
index 912054cc38..78d6cf1c0b 100644
--- a/meta/recipes-core/dropbear/dropbear_0.52.bb
+++ b/meta/recipes-core/dropbear/dropbear_0.52.bb
@@ -3,4 +3,4 @@ require dropbear.inc
3SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e" 3SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e"
4SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108" 4SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108"
5 5
6PR = "r1" 6PR = "r2"