summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 10:32:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 11:52:10 (GMT)
commitd431ef2a30c038573c9ee7ec7ab8009c6e2ab113 (patch)
tree4c91aea006ec26a273e2cc9bacc9a0faf6a37f88 /meta/recipes-core
parent388bae1ac8df4baf5f9255917768314c9f833b03 (diff)
downloadpoky-d431ef2a30c038573c9ee7ec7ab8009c6e2ab113.tar.gz
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] (From OE-Core rev: 1d6156e37ef0f36cf5ce8eeaaf23560215c86833) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc11
1 files changed, 1 insertions, 10 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 1894715..2d6aeb2 100644
--- 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 \
16 file://dropbear-0.53.1-static_build_fix.patch \ 16 file://dropbear-0.53.1-static_build_fix.patch \
17 file://configure.patch \ 17 file://configure.patch \
18 file://fix-2kb-keys.patch \ 18 file://fix-2kb-keys.patch \
19 file://allow-nopw.patch;apply=no \ 19 ${@base_contains("DISTRO_TYPE", "debug", "file://allow-nopw.patch", "",d)} \
20 file://init \ 20 file://init \
21 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " 21 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
22 22
@@ -40,15 +40,6 @@ EXTRA_OECONF += "\
40 40
41DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" 41DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
42 42
43do_debug_patch() {
44 if [ "${DISTRO_TYPE}" = "debug" ]; then
45 bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!"
46 patch -p1 < ${WORKDIR}/allow-nopw.patch
47 fi
48}
49
50addtask do_debug_patch after do_patch before do_configure
51
52do_install() { 43do_install() {
53 install -d ${D}${sysconfdir} \ 44 install -d ${D}${sysconfdir} \
54 ${D}${sysconfdir}/init.d \ 45 ${D}${sysconfdir}/init.d \