diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2011-06-20 19:01:13 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-23 11:55:01 +0100 |
| commit | 16fbdaa24fd4add37c1e873505f55bcef5695a94 (patch) | |
| tree | 7447ee038e6b5aee2dedbd4783f794b67a282329 /meta/recipes-core | |
| parent | 1e232db4f6e90577f75efabd279b6980277b9547 (diff) | |
| download | openembedded-core-16fbdaa24fd4add37c1e873505f55bcef5695a94.tar.gz openembedded-core-16fbdaa24fd4add37c1e873505f55bcef5695a94.tar.bz2 openembedded-core-16fbdaa24fd4add37c1e873505f55bcef5695a94.tar.xz openembedded-core-16fbdaa24fd4add37c1e873505f55bcef5695a94.zip | |
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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear_0.52.bb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index e9290ff9a..c9c41d211 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 912054cc3..78d6cf1c0 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" |