summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dropbear
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-07-25 08:08:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 11:02:40 (GMT)
commit0590ed10fcb293ed0563d11ab3864359417b413e (patch)
treeb4bfadeb581b8df50c5d8d314f51edb5c8f6c844 /meta/recipes-core/dropbear
parent9321db3fc68e7e83c811316f0b46aa7bc0245c41 (diff)
downloadpoky-0590ed10fcb293ed0563d11ab3864359417b413e.tar.gz
dropbear: don't override DISTRO_TYPE if it is already set
The long term solution is to remove the IMAGE_FEATURE check since images are not allowed to influence recipe compile options. (From OE-Core rev: 1c24f36e982e680871bf7a05ac6e820314e19c7c) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear')
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc2
-rw-r--r--meta/recipes-core/dropbear/dropbear_0.52.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 1b51e1a..526a5a0 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -29,7 +29,7 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
29BINCOMMANDS = "dbclient ssh scp" 29BINCOMMANDS = "dbclient ssh scp"
30EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' 30EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
31 31
32DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" 32DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
33 33
34do_debug_patch() { 34do_debug_patch() {
35 if [ "${DISTRO_TYPE}" = "debug" ]; then 35 if [ "${DISTRO_TYPE}" = "debug" ]; then
diff --git a/meta/recipes-core/dropbear/dropbear_0.52.bb b/meta/recipes-core/dropbear/dropbear_0.52.bb
index 78d6cf1..4013c65 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 = "r2" 6PR = "r3"