diff options
Diffstat (limited to 'meta/classes/copyleft_compliance.bbclass')
| -rw-r--r-- | meta/classes/copyleft_compliance.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/copyleft_compliance.bbclass b/meta/classes/copyleft_compliance.bbclass index 06b02278d3..907c1836b3 100644 --- a/meta/classes/copyleft_compliance.bbclass +++ b/meta/classes/copyleft_compliance.bbclass @@ -2,12 +2,9 @@ # 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' @@ -33,12 +30,14 @@ python do_prepare_copyleft_sources () { pf = d.getVar('PF', True) 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) @@ -49,7 +48,7 @@ python do_prepare_copyleft_sources () { 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('/', '_')) @@ -61,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' |