summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-09-22 17:21:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-22 18:12:53 +0100
commit47c1ff11a9b8b1e9f40ffb2b3d387252200cf0ec (patch)
treea66877a5b8545b8a5cb874f59300f5c01d917a24
parent87bedd137a77c5ac0033a1de4587c40dbe93e81d (diff)
downloadopenembedded-core-contrib-47c1ff11a9b8b1e9f40ffb2b3d387252200cf0ec.tar.gz
openembedded-core-contrib-47c1ff11a9b8b1e9f40ffb2b3d387252200cf0ec.tar.bz2
openembedded-core-contrib-47c1ff11a9b8b1e9f40ffb2b3d387252200cf0ec.zip
classes/externalsrc: fix setting of deps varflag as a string
The value of the deps varflag for tasks is (unusually) expected to be a list object rather than a space-separated string, hence we cannot use appendVarFlag() here. This fixes a traceback when parsing the gcc recipe with externalsrc enabled, for example. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/externalsrc.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 70e6fd76b3..f7ed66d8c6 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -73,7 +73,8 @@ python () {
fetch_tasks = ['do_fetch', 'do_unpack']
# If we deltask do_patch, there's no dependency to ensure do_unpack gets run, so add one
- d.appendVarFlag('do_configure', 'deps', ['do_unpack'])
+ # Note that we cannot use d.appendVarFlag() here because deps is expected to be a list object, not a string
+ d.setVarFlag('do_configure', 'deps', (d.getVarFlag('do_configure', 'deps', False) or []) + ['do_unpack'])
for task in d.getVar("SRCTREECOVEREDTASKS", True).split():
if local_srcuri and task in fetch_tasks: