[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-commits
Subject:    [oe-commits] Cristiana Voicu : toaster.bbclass: the license.manifest is located in DEPLOY_DIR
From:       git () git ! openembedded ! org (git at git ! openembedded ! org)
Date:       2014-03-31 21:47:09
Message-ID: 20140331214709.383A6503D5 () opal
[Download RAW message or body]

Module: openembedded-core.git
Branch: master-next
Commit: 64c0ea3adccfc8af911b5e25e4c64a0abc578e6c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=64c0ea3adccfc8af911b5e25e4c64a0abc578e6c


Author: Cristiana Voicu <cristiana.voicu at intel.com>
Date:   Mon Mar 31 17:39:19 2014 +0100

toaster.bbclass: the license.manifest is located in DEPLOY_DIR

Replaced DEPLOY_DIR_IMAGE with DEPLOY_DIR

[YOCTO #6051]
Signed-off-by: Cristiana Voicu <cristiana.voicu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/toaster.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index ce40afa..f7518ad 100644
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -284,10 +284,10 @@ python toaster_buildhistory_dump() {
 # dump information related to license manifest path
 
 python toaster_licensemanifest_dump() {
-    deploy_dir_image = d.getVar('DEPLOY_DIR_IMAGE', True);
+    deploy_dir = d.getVar('DEPLOY_DIR', True);
     image_name = d.getVar('IMAGE_NAME', True);
 
-    data = { 'deploy_dir_image' : deploy_dir_image, 'image_name' : image_name }
+    data = { 'deploy_dir' : deploy_dir, 'image_name' : image_name }
 
     bb.event.fire(bb.event.MetadataEvent("LicenseManifestPath", data), d)
 }


[prev in list] [next in list] [prev in thread] [next in thread]