Patchwork [37/40] dropbear: Don't patch in configure

login
mail settings
Submitter Mark Hatle
Date June 22, 2011, 5:36 p.m.
Message ID <5ce881c3697d8314d75b4399cab7c035336a3c6c.1308763995.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/6313/
State New, archived
Headers show

Comments

Mark Hatle - June 22, 2011, 5:36 p.m.
We need to avoid applying a patch in configure, because a rebuild could
trigger this, without triggering do_patch.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-core/dropbear/dropbear.inc     |    4 +++-
 meta/recipes-core/dropbear/dropbear_0.52.bb |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index e9290ff..c9c41d2 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}"'
 
 DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
 
-do_configure_prepend() {
+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 \
diff --git a/meta/recipes-core/dropbear/dropbear_0.52.bb b/meta/recipes-core/dropbear/dropbear_0.52.bb
index 912054c..78d6cf1 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
 SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e"
 SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108"
 
-PR = "r1"
+PR = "r2"