diff options
| author |   Kevin Strasser <kevin.strasser@linux.intel.com> | 2013-03-11 15:51:23 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-18 13:17:32 +0000 |
| commit | 392562a21d9f2deb6fe6f8bb5378b09f4c5918d4 (patch) | |
| tree | 94e9f2aa0456e1a91b8ecdde9b94d51f81a259b8 /meta/classes/archiver.bbclass | |
| parent | 7f1f3e6b6db9a50f5e68bc8dff95549e692153b1 (diff) | |
| download | openembedded-core-contrib-392562a21d9f2deb6fe6f8bb5378b09f4c5918d4.tar.gz | |
archiver: fix archive filtering behavior
With the addition of sstate, ensure that archiving tasks are only
added to the build if they produce output in the directory specified
by the 'sstate-inputdirs' flag.
Move calls to 'tar_filter' and 'not_tarball' out to
archive-*-source.bbclass in order to filter out packages before their
archiving tasks are added to the build.
Additionally, negate the return value of copyleft_should_include in
tar_filter, so that packages that do not pass are in turn filtered out.
Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/archiver.bbclass')
| -rw-r--r-- | meta/classes/archiver.bbclass | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 43238272c5..ed07b2edb8 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -75,10 +75,7 @@ def tar_filter(d): """ if d.getVar('FILTER', True) == "yes": included, reason = copyleft_should_include(d) - if not included: - return False - else: - return True + return not included else: return False @@ -400,8 +397,6 @@ def archive_sources_patches(d, stage_name): import shutil check_archiving_type(d) - if not_tarball(d) or tar_filter(d): - return source_tar_name = archive_sources(d, stage_name) if stage_name == "prepatch": @@ -431,8 +426,6 @@ def archive_scripts_logs(d): """ import shutil - if tar_filter(d): - return work_dir = d.getVar('WORKDIR', True) temp_dir = os.path.join(work_dir, 'temp') source_archive_log_with_scripts = d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) @@ -459,8 +452,6 @@ def dumpdata(d): kinds of variables and functions when running a task """ - if tar_filter(d): - return workdir = bb.data.getVar('WORKDIR', d, 1) distro = bb.data.getVar('DISTRO', d, 1) s = d.getVar('S', True) @@ -491,8 +482,6 @@ def create_diff_gz(d): import shutil import subprocess - if tar_filter(d): - return work_dir = d.getVar('WORKDIR', True) exclude_from = d.getVar('ARCHIVE_EXCLUDE_FROM', True).split() pf = d.getVar('PF', True) |