From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 25 Jul 2011 08:08:59 +0000 (+0200)
Subject: dropbear: don't override DISTRO_TYPE if it is already set
X-Git-Tag: 2011-1~598
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1c24f36e982e680871bf7a05ac6e820314e19c7c;p=openembedded-core.git

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.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 1b51e1a588..526a5a045d 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -29,7 +29,7 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
 BINCOMMANDS = "dbclient ssh scp"
 EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
 
-DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
+DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
 
 do_debug_patch() {
 	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 78d6cf1c0b..4013c65074 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 = "r2"
+PR = "r3"