summaryrefslogtreecommitdiffstats
path: root/meta/classes/archive-original-source.bbclass
diff options
context:
space:
mode:
authorKevin Strasser <kevin.strasser@linux.intel.com>2013-03-11 15:51:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-18 13:18:21 +0000
commit52026492c61cd51ee53852c8e353cb274c601c88 (patch)
tree1426cdfcabe8989ab545b67109823888e45237c9 /meta/classes/archive-original-source.bbclass
parent6b8ed0660fad4c4229bf991968ac98b8c715b3a8 (diff)
downloadpoky-52026492c61cd51ee53852c8e353cb274c601c88.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. (From OE-Core rev: 392562a21d9f2deb6fe6f8bb5378b09f4c5918d4) Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/archive-original-source.bbclass')
-rw-r--r--meta/classes/archive-original-source.bbclass10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass
index 2858d33876..1e138ce2fa 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -14,11 +14,15 @@ addtask do_archive_original_sources_patches after do_unpack
14addtask do_archive_scripts_logs 14addtask do_archive_scripts_logs
15 15
16# Get dump date and create diff file 16# Get dump date and create diff file
17addtask do_dumpdata_create_diff_gz before do_build 17addtask do_dumpdata_create_diff_gz
18 18
19python () { 19python () {
20 pn = d.getVar('PN', True) 20 pn = d.getVar('PN', True)
21 packaging = d.getVar('IMAGE_PKGTYPE', True) 21 packaging = d.getVar('IMAGE_PKGTYPE', True)
22
23 if tar_filter(d):
24 return
25
22 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging) 26 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging)
23 27
24 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm': 28 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
@@ -27,7 +31,9 @@ python () {
27 original sources and scripts/logs in ${DEPLOY_DIR}/sources. 31 original sources and scripts/logs in ${DEPLOY_DIR}/sources.
28 """ 32 """
29 d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn) 33 d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn)
30 build_deps = ' %s:do_archive_original_sources_patches' %pn 34 build_deps = ' %s:do_dumpdata_create_diff_gz' %pn
35 if not not_tarball(d):
36 build_deps += ' %s:do_archive_original_sources_patches' %pn
31 if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts': 37 if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts':
32 build_deps += ' %s:do_archive_scripts_logs' %pn 38 build_deps += ' %s:do_archive_scripts_logs' %pn
33 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) 39 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)