[PATCH] license bbclass: put licenses in DEPLOY_DIR/licenses to avoid sstate problems when MACHINE is part of DEPLOY_DIR_IMAGE

[PATCH] license bbclass: put licenses in DEPLOY_DIR/licenses to avoid sstate problems when MACHINE is part of DEPLOY_DIR_IMAGE

[Koen Kooi]

See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/002535.html for more info.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/classes/license.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index d0a1418..4fd1f85 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -8,7 +8,7 @@
 #  licenses.conf and compare them to the license names in the recipes. You'll see some
 #  differences and that should be corrected.
 
-LICENSE_DIRECTORY ??= "${DEPLOY_DIR_IMAGE}/licenses"
+LICENSE_DIRECTORY ??= "${DEPLOY_DIR}/licenses"
 LICSSTATEDIR = "${WORKDIR}/license-destdir/"
 
 addtask populate_lic after do_patch before do_package 
-- 
1.6.6.1

Re: [PATCH] license bbclass: put licenses in DEPLOY_DIR/licenses to avoid sstate problems when MACHINE is part of DEPLOY_DIR_IMAGE

[Richard Purdie]

On Tue, 2011-05-17 at 11:47 +0200, Koen Kooi wrote:
> See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/002535.html for more info.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/classes/license.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
> index d0a1418..4fd1f85 100644
> --- a/meta/classes/license.bbclass
> +++ b/meta/classes/license.bbclass
> @@ -8,7 +8,7 @@
>  #  licenses.conf and compare them to the license names in the recipes. You'll see some
>  #  differences and that should be corrected.
>  
> -LICENSE_DIRECTORY ??= "${DEPLOY_DIR_IMAGE}/licenses"
> +LICENSE_DIRECTORY ??= "${DEPLOY_DIR}/licenses"
>  LICSSTATEDIR = "${WORKDIR}/license-destdir/"
>  
>  addtask populate_lic after do_patch before do_package 

Merged to master, thanks.

Richard