From 388e5802dfa583cf186c906d1851d075431edd3d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 15 Dec 2015 16:40:36 +0000 Subject: 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 --- meta/classes/license.bbclass | 6 ++++-- 1 file 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): # 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): """ -- cgit v1.2.3-54-g00ecf