summaryrefslogtreecommitdiffstats
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:30 +0000
commit388e5802dfa583cf186c906d1851d075431edd3d (patch)
treeba817de01061f73607fc0657a70dd1f9460e8909
parentf19e8de4cfafa86aa90e27dded89d815537b9825 (diff)
downloadpoky-388e5802dfa583cf186c906d1851d075431edd3d.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. (From OE-Core rev: 697072130a3298aede7166f125aa982be23793ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 be1e0e7095..6651d55c01 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -192,7 +192,7 @@ def get_deployed_dependencies(d):
192 # usually in this var and not listed in rootfs. 192 # usually in this var and not listed in rootfs.
193 # At last, get the dependencies from boot classes because 193 # At last, get the dependencies from boot classes because
194 # it might contain the bootloader. 194 # it might contain the bootloader.
195 taskdata = d.getVar("BB_TASKDEPDATA", True) 195 taskdata = d.getVar("BB_TASKDEPDATA", False)
196 depends = list(set([dep[0] for dep 196 depends = list(set([dep[0] for dep
197 in taskdata.itervalues() 197 in taskdata.itervalues()
198 if not dep[0].endswith("-native")])) 198 if not dep[0].endswith("-native")]))
@@ -228,6 +228,7 @@ def get_deployed_dependencies(d):
228 break 228 break
229 229
230 return deploy 230 return deploy
231get_deployed_dependencies[vardepsexclude] = "BB_TASKDEPDATA"
231 232
232def get_boot_dependencies(d): 233def get_boot_dependencies(d):
233 """ 234 """
@@ -236,7 +237,7 @@ def get_boot_dependencies(d):
236 237
237 depends = [] 238 depends = []
238 boot_depends_string = "" 239 boot_depends_string = ""
239 taskdepdata = d.getVar("BB_TASKDEPDATA", True) 240 taskdepdata = d.getVar("BB_TASKDEPDATA", False)
240 # Only bootimg and bootdirectdisk include the depends flag 241 # Only bootimg and bootdirectdisk include the depends flag
241 boot_tasks = ["do_bootimg", "do_bootdirectdisk",] 242 boot_tasks = ["do_bootimg", "do_bootdirectdisk",]
242 243
@@ -264,6 +265,7 @@ def get_boot_dependencies(d):
264 depends.append(taskdep[0]) 265 depends.append(taskdep[0])
265 break 266 break
266 return depends 267 return depends
268get_boot_dependencies[vardepsexclude] = "BB_TASKDEPDATA"
267 269
268def get_deployed_files(man_file): 270def get_deployed_files(man_file):
269 """ 271 """