summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-01-18 12:26:33 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-19 17:24:53 +0000
commit5e881c185c06b5c48e09539e2684c2f3750109eb (patch)
tree61031034bba6b20ab8027e2ba3092e0919280f95 /meta/classes
parent2e9f092c9750250b5dd7e4c1be6b71947aba6429 (diff)
downloadpoky-5e881c185c06b5c48e09539e2684c2f3750109eb.tar.gz
classes/populate_sdk_ext: fix task dependency regression
Fix a regression caused by OE-Core revision eabeb26335b1a4eb1e68218160dbdbe8fdf36272 where we lost the task dependency on packages in TOOLCHAIN_HOST_TASK (such as meta-environment-extsdk-${MACHINE}) which led to errors about missing packages when building the extensible SDK. This happened because I only moved half of the dependencies coming from the standard SDK task to do_sdk_depends. While I'm at it, tidy up the do_populate_sdk_ext[depends] line. (From OE-Core rev: 80309a2ba25de219b5339f1af6d5052d6229b676) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 2f788ee7dc..e5e55b3606 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -303,6 +303,7 @@ do_sdk_depends[dirs] = "${WORKDIR}"
303do_sdk_depends[depends] = "${@get_ext_sdk_depends(d)}" 303do_sdk_depends[depends] = "${@get_ext_sdk_depends(d)}"
304do_sdk_depends[recrdeptask] = "${@d.getVarFlag('do_populate_sdk', 'recrdeptask', False)}" 304do_sdk_depends[recrdeptask] = "${@d.getVarFlag('do_populate_sdk', 'recrdeptask', False)}"
305do_sdk_depends[recrdeptask] += "do_populate_lic do_package_qa do_populate_sysroot do_deploy" 305do_sdk_depends[recrdeptask] += "do_populate_lic do_package_qa do_populate_sysroot do_deploy"
306do_sdk_depends[rdepends] = "${@get_sdk_ext_rdepends(d)}"
306 307
307def get_sdk_ext_rdepends(d): 308def get_sdk_ext_rdepends(d):
308 localdata = d.createCopy() 309 localdata = d.createCopy()
@@ -311,10 +312,9 @@ def get_sdk_ext_rdepends(d):
311 return localdata.getVarFlag('do_populate_sdk', 'rdepends', True) 312 return localdata.getVarFlag('do_populate_sdk', 'rdepends', True)
312 313
313do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}" 314do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}"
314do_populate_sdk_ext[depends] += "${@d.getVarFlag('do_populate_sdk', 'depends', False)}"
315do_populate_sdk_ext[rdepends] = "${@get_sdk_ext_rdepends(d)}"
316 315
317do_populate_sdk_ext[depends] += "buildtools-tarball:do_populate_sdk uninative-tarball:do_populate_sdk" 316do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \
317 buildtools-tarball:do_populate_sdk uninative-tarball:do_populate_sdk"
318 318
319do_populate_sdk_ext[rdepends] += "${@' '.join([x + ':do_build' for x in d.getVar('SDK_TARGETS', True).split()])}" 319do_populate_sdk_ext[rdepends] += "${@' '.join([x + ':do_build' for x in d.getVar('SDK_TARGETS', True).split()])}"
320 320