* [PATCH] dropbear: don't override DISTRO_TYPE if it is already set
@ 2011-07-25 8:08 Koen Kooi
2011-07-26 12:45 ` Koen Kooi
2011-07-28 0:05 ` Saul Wold
0 siblings, 2 replies; 3+ messages in thread
From: Koen Kooi @ 2011-07-25 8:08 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] dropbear: don't override DISTRO_TYPE if it is already set
2011-07-25 8:08 [PATCH] dropbear: don't override DISTRO_TYPE if it is already set Koen Kooi
@ 2011-07-26 12:45 ` Koen Kooi
2011-07-28 0:05 ` Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Koen Kooi @ 2011-07-26 12:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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@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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] dropbear: don't override DISTRO_TYPE if it is already set
2011-07-25 8:08 [PATCH] dropbear: don't override DISTRO_TYPE if it is already set Koen Kooi
2011-07-26 12:45 ` Koen Kooi
@ 2011-07-28 0:05 ` Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Saul Wold @ 2011-07-28 0:05 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
On 07/25/2011 01:08 AM, Koen Kooi wrote:
> 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>
> ---
> 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"
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-28 0:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-25 8:08 [PATCH] dropbear: don't override DISTRO_TYPE if it is already set Koen Kooi
2011-07-26 12:45 ` Koen Kooi
2011-07-28 0:05 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox