dropbear: Allow tasks to be safely re-executed

Re-running the debug_patch task would cause the build to fail. This patch
moves the extra patch handling directly into SRC_URI and removes the need
for the separate task, allowing safe re-execution of each task.

[YOCTO #2194]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 189471511c0b31de58de8ab6a6a6aed7fa211d84..2d6aeb2177ef585bd25fb98cef6d5d24121f52af 100644 (file)
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -16,7 +16,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
                 file://dropbear-0.53.1-static_build_fix.patch \
                 file://configure.patch \
                 file://fix-2kb-keys.patch \
-                file://allow-nopw.patch;apply=no \
+                ${@base_contains("DISTRO_TYPE", "debug", "file://allow-nopw.patch", "",d)} \
                 file://init \
                  ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
 
@@ -40,15 +40,6 @@ EXTRA_OECONF += "\
 
 DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
 
-do_debug_patch() {
-       if [ "${DISTRO_TYPE}" = "debug" ]; then
-               bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!"
-               patch -p1 < ${WORKDIR}/allow-nopw.patch
-       fi
-}
-
-addtask do_debug_patch after do_patch before do_configure
-
 do_install() {
        install -d ${D}${sysconfdir} \
                   ${D}${sysconfdir}/init.d \