[OE-core] [PATCH] dropbear: don't override DISTRO_TYPE if it is already set

[Koen Kooi]

ping

Op 25 jul. 2011, om 10:08 heeft Koen Kooi het volgende geschreven:

> 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 at dominion.thruhere.net>
> ---
> meta/recipes-core/dropbear/dropbear.inc     |    2 +-
> meta/recipes-core/dropbear/dropbear_0.52.bb |    2 +-
> 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"
> 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 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
> SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e"
> SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108"
> 
> -PR = "r2"
> +PR = "r3"
> -- 
> 1.6.6.1
>