Skip to contentSkip to conversation

Extensible SDK regression fix

PATCH New Paul Eggleton 1 participant 2 messages Jan 17, 2016

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Extensible SDK regression fix

The following changes since commit a42229df424552955c0ac62da1063461f97f5938:

openssh: CVE-2016-1907 (2016-01-17 11:32:21 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/extsdk-depends-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/extsdk-depends-fix

Paul Eggleton (1):
classes/populate_sdk_ext: fix task dependency regression

 meta/classes/populate_sdk_ext.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.5.0
author
#1 lore raw

PATCH 1/1 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.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/populate_sdk_ext.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/classes/populate_sdk_ext.bbclass +3 -3
index 2f788ee..e5e55b3 100644
@@ -303,6 +303,7 @@ do_sdk_depends[dirs] = "${WORKDIR}"
 do_sdk_depends[depends] = "${@get_ext_sdk_depends(d)}"
 do_sdk_depends[recrdeptask] = "${@d.getVarFlag('do_populate_sdk', 'recrdeptask', False)}"
 do_sdk_depends[recrdeptask] += "do_populate_lic do_package_qa do_populate_sysroot do_deploy"
+do_sdk_depends[rdepends] = "${@get_sdk_ext_rdepends(d)}"
 
 def get_sdk_ext_rdepends(d):
     localdata = d.createCopy()

@@ -311,10 +312,9 @@ def get_sdk_ext_rdepends(d):
     return localdata.getVarFlag('do_populate_sdk', 'rdepends', True)
 
 do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}"
-do_populate_sdk_ext[depends] += "${@d.getVarFlag('do_populate_sdk', 'depends', False)}"
-do_populate_sdk_ext[rdepends] = "${@get_sdk_ext_rdepends(d)}"
 
-do_populate_sdk_ext[depends] += "buildtools-tarball:do_populate_sdk uninative-tarball:do_populate_sdk"
+do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \
+                                buildtools-tarball:do_populate_sdk uninative-tarball:do_populate_sdk"
 
 do_populate_sdk_ext[rdepends] += "${@' '.join([x + ':do_build' for x in d.getVar('SDK_TARGETS', True).split()])}"
Signature · 1 line
2.5.0