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 srpm archiving build errors

Browse Source 
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>
This commit is contained in:
Kevin Strasser
2013-03-22 13:19:22 -07:00
committed by Richard Purdie
parent 805eede157
commit 3e4655d951
4 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/archive-configured-source.bbclass
+8 -15
View File
@@ -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
configured 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_compile', 'depends', ' %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)
d.appendVarFlag('do_build', 'depends', build_deps)
build_deps += ' %s:do_archive_configured_sources' %pn
else:
d.prependVarFlag('do_configure', 'postfuncs', "do_archive_configured_sources")
d.prependVarFlag('do_package_write_rpm', 'prefuncs', "do_archive_scripts_logs")
d.appendVarFlag('do_build', 'depends', build_deps)
}
ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"