mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

archiver: fix archive filtering behavior

Browse Source 
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>
This commit is contained in:
Kevin Strasser
2013-03-11 15:51:23 -07:00
committed by Richard Purdie
parent 6b8ed0660f
commit 52026492c6
4 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/archive-configured-source.bbclass
+8 -2
View File
@@ -14,11 +14,15 @@ addtask do_archive_configured_sources after do_configure
addtask do_archive_scripts_logs
# Get dump date and create diff file
addtask do_dumpdata_create_diff_gz before do_build
addtask do_dumpdata_create_diff_gz
python () {
pn = d.getVar('PN', True)
packaging = d.getVar('IMAGE_PKGTYPE', True)
if tar_filter(d):
return
d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging)
if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
@@ -27,7 +31,9 @@ python () {
configured sources and scripts/logs in ${DEPLOY_DIR}/sources.
"""
d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn)
build_deps = ' %s:do_archive_configured_sources' %pn
build_deps = ' %s:do_dumpdata_create_diff_gz' %pn
if not not_tarball(d):
build_deps += ' %s:do_archive_configured_sources' %pn
if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts':
build_deps += ' %s:do_archive_scripts_logs' %pn
d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)