diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/archive-configured-source.bbclass | 10 | ||||
| -rw-r--r-- | meta/classes/archive-original-source.bbclass | 10 | ||||
| -rw-r--r-- | meta/classes/archive-patched-source.bbclass | 10 |
3 files changed, 21 insertions, 9 deletions
diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass index e492ce300d..4fc5129c9d 100644 --- a/meta/classes/archive-configured-source.bbclass +++ b/meta/classes/archive-configured-source.bbclass @@ -11,22 +11,26 @@ inherit archiver addtask do_archive_configured_sources after do_configure # 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 configured sources and scripts/logs in ${DEPLOY_DIR}/sources. """ - pn = d.getVar('PN', True) d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn) build_deps = ' %s:do_archive_configured_sources' %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_configure', 'postfuncs', "do_archive_configured_sources") 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") diff --git a/meta/classes/archive-patched-source.bbclass b/meta/classes/archive-patched-source.bbclass index f9f558e652..d7ed6c8785 100644 --- a/meta/classes/archive-patched-source.bbclass +++ b/meta/classes/archive-patched-source.bbclass @@ -11,22 +11,26 @@ inherit archiver addtask do_archive_patched_sources after do_patch # Get archiving package with logs(temp) 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 patched sources and scripts/logs in ${DEPLOY_DIR}/sources. """ - pn = d.getVar('PN', True) d.appendVarFlag('do_configure', 'depends', ' %s:do_archive_patched_sources' %pn) build_deps = ' %s:do_archive_patched_sources' %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_patch', 'postfuncs', "do_archive_patched_sources") |