From 0783686c4dc837674a2bcf3ca1f3f4858e256195 Mon Sep 17 00:00:00 2001 From: Muhammad Shakeel Date: Wed, 20 Feb 2013 18:50:57 +0500 Subject: archive-*-source.bbclass: Handle all package classes * Add archiver tasks correctly for any 'IMAGE_PKGTYPE'. [YOCTO #3449] Signed-off-by: Muhammad Shakeel Signed-off-by: Noor Ahsan Signed-off-by: Christopher Larson Signed-off-by: Saul Wold --- meta/classes/archive-original-source.bbclass | 10 +++++++--- 1 file changed, 7 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 f123cafcb0..3aea4f468f 100644 --- a/meta/classes/archive-original-source.bbclass +++ b/meta/classes/archive-original-source.bbclass @@ -11,22 +11,26 @@ inherit archiver addtask do_archive_original_sources_patches after do_unpack # Get archiving package with temp(logs) and scripts(.bb and inc files) -addtask do_archive_scripts_logs after do_package_write_rpm +addtask do_archive_scripts_logs # Get dump date and create diff file -addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build +addtask do_dumpdata_create_diff_gz before do_build python () { + pn = d.getVar('PN', True) + packaging = d.getVar('IMAGE_PKGTYPE', True) + d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging) + 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) + d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) else: d.prependVarFlag('do_unpack', 'postfuncs', "do_archive_original_sources_patches") -- cgit 1.2.3-korg