summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-15 16:40:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 11:56:10 +0000
commit697072130a3298aede7166f125aa982be23793ca (patch)
tree2dcc258f488a3c2b1dbaff48268e6577895f2b35 /meta
parent770618eb33fc576f903a4c8011cc2d9f8f78071d (diff)
downloadopenembedded-core-contrib-697072130a3298aede7166f125aa982be23793ca.tar.gz
license: Fix BB_TASKDEPDATA references
We shouldn't try and expand what is a python dict object and we don't want it to influence the task hashes, task dependencies are already accounted for. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/license.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index be1e0e7095e..6651d55c017 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -192,7 +192,7 @@ def get_deployed_dependencies(d):
# usually in this var and not listed in rootfs.
# At last, get the dependencies from boot classes because
# it might contain the bootloader.
- taskdata = d.getVar("BB_TASKDEPDATA", True)
+ taskdata = d.getVar("BB_TASKDEPDATA", False)
depends = list(set([dep[0] for dep
in taskdata.itervalues()
if not dep[0].endswith("-native")]))
@@ -228,6 +228,7 @@ def get_deployed_dependencies(d):
break
return deploy
+get_deployed_dependencies[vardepsexclude] = "BB_TASKDEPDATA"
def get_boot_dependencies(d):
"""
@@ -236,7 +237,7 @@ def get_boot_dependencies(d):
depends = []
boot_depends_string = ""
- taskdepdata = d.getVar("BB_TASKDEPDATA", True)
+ taskdepdata = d.getVar("BB_TASKDEPDATA", False)
# Only bootimg and bootdirectdisk include the depends flag
boot_tasks = ["do_bootimg", "do_bootdirectdisk",]
@@ -264,6 +265,7 @@ def get_boot_dependencies(d):
depends.append(taskdep[0])
break
return depends
+get_boot_dependencies[vardepsexclude] = "BB_TASKDEPDATA"
def get_deployed_files(man_file):
"""