diff options
Diffstat (limited to 'meta/classes/copyleft_compliance.bbclass')
| -rw-r--r-- | meta/classes/copyleft_compliance.bbclass | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/meta/classes/copyleft_compliance.bbclass b/meta/classes/copyleft_compliance.bbclass index e68942d84c..eabf12ce7a 100644 --- a/meta/classes/copyleft_compliance.bbclass +++ b/meta/classes/copyleft_compliance.bbclass @@ -2,20 +2,18 @@ # Defaults to using symlinks, as it's a quick operation, and one can easily # follow the links when making use of the files (e.g. tar with the -h arg). # -# By default, includes all GPL and LGPL, and excludes CLOSED and Proprietary. -# # vi:sts=4:sw=4:et -# Need the copyleft_should_include -inherit archiver +inherit copyleft_filter COPYLEFT_SOURCES_DIR ?= '${DEPLOY_DIR}/copyleft_sources' python do_prepare_copyleft_sources () { """Populate a tree of the recipe sources and emit patch series files""" + import os.path import shutil - p = d.getVar('P', True) + p = d.getVar('P') included, reason = copyleft_should_include(d) if not included: bb.debug(1, 'copyleft: %s is excluded: %s' % (p, reason)) @@ -23,27 +21,34 @@ python do_prepare_copyleft_sources () { else: bb.debug(1, 'copyleft: %s is included: %s' % (p, reason)) - sources_dir = d.getVar('COPYLEFT_SOURCES_DIR', True) - src_uri = d.getVar('SRC_URI', True).split() + sources_dir = d.getVar('COPYLEFT_SOURCES_DIR') + dl_dir = d.getVar('DL_DIR') + src_uri = d.getVar('SRC_URI').split() fetch = bb.fetch2.Fetch(src_uri, d) ud = fetch.ud - locals = (fetch.localpath(url) for url in fetch.urls) - localpaths = [local for local in locals if not local.endswith('.bb')] - if not localpaths: - return - - pf = d.getVar('PF', True) + pf = d.getVar('PF') dest = os.path.join(sources_dir, pf) shutil.rmtree(dest, ignore_errors=True) - bb.mkdirhier(dest) + bb.utils.mkdirhier(dest) + + for u in ud.values(): + local = os.path.normpath(fetch.localpath(u.url)) + if local.endswith('.bb'): + continue + elif local.endswith('/'): + local = local[:-1] + + if u.mirrortarball: + tarball_path = os.path.join(dl_dir, u.mirrortarball) + if os.path.exists(tarball_path): + local = tarball_path - for path in localpaths: - os.symlink(path, os.path.join(dest, os.path.basename(path))) + oe.path.symlink(local, os.path.join(dest, os.path.basename(local)), force=True) patches = src_patches(d) for patch in patches: - _, _, local, _, _, parm = bb.decodeurl(patch) + _, _, local, _, _, parm = bb.fetch.decodeurl(patch) patchdir = parm.get('patchdir') if patchdir: series = os.path.join(dest, 'series.subdir.%s' % patchdir.replace('/', '_')) @@ -55,4 +60,5 @@ python do_prepare_copyleft_sources () { } addtask prepare_copyleft_sources after do_fetch before do_build +do_prepare_copyleft_sources[dirs] = "${WORKDIR}" do_build[recrdeptask] += 'do_prepare_copyleft_sources' |