mirror of
https://git.yoctoproject.org/poky
synced 2026-02-13 04:03:03 +01:00
1a7201545b
do_rootfs[cleandirs] contains ${S} and, if do_rootfs task starts before
the do_dumpdata_create_diff_gz is finished, an error will occur in the
process because the directory will be removed while still needed by the
create_diff_gz() function.
This patch will force the do_dumpdata_create_diff_gz task to run before
do_rootfs when the final image is created.
[YOCTO #4310]
(From OE-Core master rev: cd90be31571178d6822dba5a94a2795209a3576c)
(From OE-Core rev: c283ab637c7e0501a309dbe9abdf14ad70834c9b)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
65 lines
2.4 KiB
Plaintext
65 lines
2.4 KiB
Plaintext
# This file is for getting archiving packages with original
|
|
# sources(archive ${S} after unpack stage), patches, logs(archive 'temp'
|
|
# after package_write_rpm), dump data and creating diff file(get all
|
|
# environment variables and functions in building and mapping all
|
|
# content in ${S} including patches to xxx.diff.gz. All archived packages
|
|
# will be deployed in ${DEPLOY_DIR}/sources
|
|
|
|
inherit archiver
|
|
|
|
# Get original sources archiving package with patches
|
|
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
|
|
|
|
# Get dump date and create diff file
|
|
addtask do_dumpdata_create_diff_gz before do_rootfs
|
|
|
|
python () {
|
|
pn = d.getVar('PN', True)
|
|
packaging = d.getVar('IMAGE_PKGTYPE', True)
|
|
|
|
if tar_filter(d):
|
|
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_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_archive_original_sources_patches' %pn
|
|
|
|
d.appendVarFlag('do_build', 'depends', build_deps)
|
|
}
|
|
|
|
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
|