diff options
author | Kevin Strasser <kevin.strasser@linux.intel.com> | 2013-03-22 13:19:22 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-03 17:01:13 +0100 |
commit | 3e4655d951d38b0f216b286bb49f8a0276ba112d (patch) | |
tree | 0074e2fd5e784093534625e80d144e4cc5c28da2 /meta/classes/archive-original-source.bbclass | |
parent | 805eede15761ef792b14afc4168f7d47c821dfd6 (diff) | |
download | ast2050-yocto-poky-3e4655d951d38b0f216b286bb49f8a0276ba112d.zip ast2050-yocto-poky-3e4655d951d38b0f216b286bb49f8a0276ba112d.tar.gz |
archiver: fix srpm archiving build errors
srpm archiving doesn't need to be handled as a different case
when deciding what archive tasks to add.
When srpm is selected as the archiving type, the scripts and logs
archive staging directory ${WORKDIR}/script-logs is cleaned, and
its contents moved out to ${WORKDIR}.
Now that we are including ${WORKDIR}/script-logs in sstate-inputdirs,
the directory must be preserved.
[YOCTO #4032]
(From OE-Core rev: 0c80286a3383b436a0a63a0b00eb357dd9dea4fb)
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.bbclass | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass index 1e138ce..7258293 100644 --- a/meta/classes/archive-original-source.bbclass +++ b/meta/classes/archive-original-source.bbclass @@ -24,24 +24,17 @@ python () { return d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging) + build_deps = ' %s:do_dumpdata_create_diff_gz' %pn - 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. - """ + if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts': + d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) + build_deps += ' %s:do_archive_scripts_logs' %pn + + if not not_tarball(d): d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn) - build_deps = ' %s:do_dumpdata_create_diff_gz' %pn - if not not_tarball(d): - build_deps += ' %s:do_archive_original_sources_patches' %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) - 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") + build_deps += ' %s:do_archive_original_sources_patches' %pn + + d.appendVarFlag('do_build', 'depends', build_deps) } ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" |