From 2b1afa10bc633c8153881921c181d0ad9b7060f0 Mon Sep 17 00:00:00 2001 From: Muhammad Shakeel Date: Wed, 20 Feb 2013 18:50:22 +0500 Subject: archiver class: Use tasks with sstate instead of pre/post funcs * Add tasks to move sources, script/logs and diff/env files in deploy directory. * Enable SSTATE for 'do_archive_scripts_logs' task * Enable SSTATE for 'do_dumpdata_create_diff_gz' task * SSTATE is not used for sources/patches archiver task because source archive package can result into a very large file. It will be an unnecessary overhead to keep sources in DL_DIR and cached-binaries. * If 'SOURCE_ARCHIVE_PACKAGE_TYPE' is 'srpm' then use pre/post functions because in this case we do not want to use tasks to move sources/logs in DEPLOY_DIR. 'do_package_write_rpm' is responsible for handling archiver packages. [YOCTO #3449] (From OE-Core rev: 959e2ae23ccbc6955a28996d4538e457cd8cfa5e) Signed-off-by: Muhammad Shakeel Signed-off-by: Noor Ahsan Signed-off-by: Christopher Larson Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/archive-original-source.bbclass | 49 ++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) (limited to 'meta/classes/archive-original-source.bbclass') diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass index 1b3f8d0b34..f123cafcb0 100644 --- a/meta/classes/archive-original-source.bbclass +++ b/meta/classes/archive-original-source.bbclass @@ -8,10 +8,53 @@ inherit archiver # Get original sources archiving package with patches -do_unpack[postfuncs] += "do_archive_original_sources_patches " +addtask do_archive_original_sources_patches after do_unpack # Get archiving package with temp(logs) and scripts(.bb and inc files) -do_package_write_rpm[prefuncs] += "do_archive_scripts_logs " +addtask do_archive_scripts_logs after do_package_write_rpm # Get dump date and create diff file -do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz " +addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build + +python () { + if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm': + """ + If package type is not 'srpm' then add tasks to move archive packages of + original sources and scripts/logs in ${DEPLOY_DIR}/sources. + """ + pn = d.getVar('PN', True) + d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn) + build_deps = ' %s:do_archive_original_sources_patches' %pn + build_deps += ' %s:do_archive_scripts_logs' %pn + d.appendVarFlag('do_build', 'depends', build_deps) + + else: + d.prependVarFlag('do_unpack', 'postfuncs', "do_archive_original_sources_patches") + d.prependVarFlag('do_package_write_rpm', 'prefuncs', "do_archive_scripts_logs") +} + +ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" +ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/" +ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/" + +SSTATETASKS += "do_archive_scripts_logs" +do_archive_scripts_logs[sstate-name] = "archive_scripts_logs" +do_archive_scripts_logs[sstate-inputdirs] = "${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}" +do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}" + +python do_archive_scripts_logs_setscene () { + sstate_setscene(d) +} + +addtask do_archive_scripts_logs_setscene + +SSTATETASKS += "do_dumpdata_create_diff_gz" +do_dumpdata_create_diff_gz[sstate-name] = "dumpdata_create_diff_gz" +do_dumpdata_create_diff_gz[sstate-inputdirs] = "${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}" +do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}" + +python do_dumpdata_create_diff_gz_setscene () { + sstate_setscene(d) +} + +addtask do_dumpdata_create_diff_gz_setscene -- cgit v1.2.3-54-g00ecf