diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-09-22 17:21:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 09:53:13 +0100 |
commit | 8fb70c6e7a1203c0b18938d5d851a91a5d27c2e3 (patch) | |
tree | fa6421f37374285a07a2635e773a9dd1383c0273 /meta/classes/externalsrc.bbclass | |
parent | 586291fe2bb1939bd77ab3c8666e5fca0060c0b8 (diff) | |
download | poky-8fb70c6e7a1203c0b18938d5d851a91a5d27c2e3.tar.gz |
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.
(From OE-Core rev: 47c1ff11a9b8b1e9f40ffb2b3d387252200cf0ec)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/externalsrc.bbclass')
-rw-r--r-- | meta/classes/externalsrc.bbclass | 3 |
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 () { | |||
73 | 73 | ||
74 | fetch_tasks = ['do_fetch', 'do_unpack'] | 74 | fetch_tasks = ['do_fetch', 'do_unpack'] |
75 | # If we deltask do_patch, there's no dependency to ensure do_unpack gets run, so add one | 75 | # If we deltask do_patch, there's no dependency to ensure do_unpack gets run, so add one |
76 | d.appendVarFlag('do_configure', 'deps', ['do_unpack']) | 76 | # Note that we cannot use d.appendVarFlag() here because deps is expected to be a list object, not a string |
77 | d.setVarFlag('do_configure', 'deps', (d.getVarFlag('do_configure', 'deps', False) or []) + ['do_unpack']) | ||
77 | 78 | ||
78 | for task in d.getVar("SRCTREECOVEREDTASKS", True).split(): | 79 | for task in d.getVar("SRCTREECOVEREDTASKS", True).split(): |
79 | if local_srcuri and task in fetch_tasks: | 80 | if local_srcuri and task in fetch_tasks: |