diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-03-09 13:57:56 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 11:03:12 +0000 |
| commit | f223ad3d5b5c90055e50d1b1be69230f55e06336 (patch) | |
| tree | 44af10b0c87aa5d3b6973927ecfb95ff1e3060e0 | |
| parent | 5cbb026212b4c8f5206a07d70b94f57edeee0839 (diff) | |
| download | openembedded-core-contrib-f223ad3d5b5c90055e50d1b1be69230f55e06336.tar.gz | |
classes/externalsrc: fix for recipes that fetch local files
If SRC_URI contains local files (file:// references) these will almost
certainly be required at some point during the build process, so we need
to actually fetch these to ${WORKDIR} as we would normally.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/externalsrc.bbclass | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index 25f0be96a5..75bdb7a14d 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -35,7 +35,13 @@ python () { d.setVar('B', externalsrcbuild) else: d.setVar('B', '${WORKDIR}/${BPN}-${PV}/') - d.setVar('SRC_URI', '') + + srcuri = (d.getVar('SRC_URI', True) or '').split() + local_srcuri = [] + for uri in srcuri: + if uri.startswith('file://'): + local_srcuri.append(uri) + d.setVar('SRC_URI', ' '.join(local_srcuri)) if '{SRCPV}' in d.getVar('PV', False): # Dummy value because the default function can't be called with blank SRC_URI @@ -65,7 +71,13 @@ python () { if setvalue: d.setVarFlag(task, 'cleandirs', ' '.join(cleandirs)) + 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']) + for task in d.getVar("SRCTREECOVEREDTASKS", True).split(): + if local_srcuri and task in fetch_tasks: + continue bb.build.deltask(task, d) d.prependVarFlag('do_compile', 'prefuncs', "externalsrc_compile_prefunc ") |