mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
classes/archive*.bbclass: remove archive-*-source.bbclass
Nearly all of the codes in the following 3 files are the same, we can move the code to archiver.bbclass and remove them: archive-configured-source.bbclass archive-original-source.bbclass archive-patched-source.bbclass [YOCTO #5113] (From OE-Core rev: d2d3428a0fc746e56c0a0046bd12a393dedb4dda) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
committed by
Richard Purdie
Richard Purdie
parent
3175653fe0
commit
f0714d1128
@@ -1,65 +0,0 @@
|
||||
# This file is for getting archiving packages with configured
|
||||
# sources(archive ${S} after configure stage), 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 archiving package with configured sources including patches
|
||||
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
|
||||
|
||||
# Get dump date and create diff file
|
||||
addtask do_dumpdata_create_diff_gz
|
||||
|
||||
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_compile', 'depends', ' %s:do_archive_configured_sources' %pn)
|
||||
build_deps += ' %s:do_archive_configured_sources' %pn
|
||||
|
||||
if bb.data.inherits_class('image', d):
|
||||
d.appendVarFlag('do_rootfs', 'depends', build_deps)
|
||||
else:
|
||||
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-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-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
|
||||
@@ -1,65 +0,0 @@
|
||||
# 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
|
||||
|
||||
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
|
||||
|
||||
if bb.data.inherits_class('image', d):
|
||||
d.appendVarFlag('do_rootfs', 'depends', build_deps)
|
||||
else:
|
||||
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-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-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
|
||||
@@ -1,65 +0,0 @@
|
||||
# This file is for getting archiving packages with patched
|
||||
# sources(archive ${S} before do_patch stage), 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 archiving package with patched sources including patches
|
||||
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
|
||||
|
||||
# Get dump date and create diff file
|
||||
addtask do_dumpdata_create_diff_gz
|
||||
|
||||
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_configure', 'depends', ' %s:do_archive_patched_sources' %pn)
|
||||
build_deps += ' %s:do_archive_patched_sources' %pn
|
||||
|
||||
if bb.data.inherits_class('image', d):
|
||||
d.appendVarFlag('do_rootfs', 'depends', build_deps)
|
||||
else:
|
||||
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-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-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
|
||||
@@ -36,6 +36,33 @@ COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk cross-
|
||||
COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list'
|
||||
COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available recipe types'
|
||||
|
||||
python () {
|
||||
pn = d.getVar('PN', True)
|
||||
packaging = d.getVar('IMAGE_PKGTYPE', True)
|
||||
|
||||
if tar_filter(d):
|
||||
return
|
||||
|
||||
if d.getVar('PACKAGES', True) != '':
|
||||
d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_%s' % (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_%s' % (pn, packaging))
|
||||
build_deps += ' %s:do_archive_scripts_logs' % pn
|
||||
|
||||
if not not_tarball(d):
|
||||
archiver_mode = d.getVar('ARCHIVER_MODE')
|
||||
d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_%s_sources' % (pn, archiver_mode))
|
||||
build_deps += ' %s:do_archive_%s_sources' % (pn, archiver_mode)
|
||||
|
||||
if bb.data.inherits_class('image', d):
|
||||
d.appendVarFlag('do_rootfs', 'depends', build_deps)
|
||||
else:
|
||||
d.appendVarFlag('do_build', 'depends', build_deps)
|
||||
}
|
||||
|
||||
def copyleft_recipe_type(d):
|
||||
for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d):
|
||||
if oe.utils.inherits(d, recipe_type):
|
||||
@@ -516,7 +543,7 @@ def create_diff_gz(d):
|
||||
|
||||
# This function will run when user want to get tarball for sources and
|
||||
# patches after do_unpack
|
||||
python do_archive_original_sources_patches(){
|
||||
python do_archive_original_sources(){
|
||||
archive_sources_patches(d, 'prepatch')
|
||||
}
|
||||
|
||||
@@ -567,3 +594,37 @@ python do_delete_tarlist(){
|
||||
}
|
||||
do_delete_tarlist[deptask] = "do_archive_scripts_logs"
|
||||
do_package_write_rpm[postfuncs] += "do_delete_tarlist "
|
||||
|
||||
# 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
|
||||
|
||||
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-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-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
|
||||
|
||||
addtask do_archive_original_sources after do_unpack
|
||||
addtask do_archive_patched_sources after do_patch
|
||||
addtask do_archive_configured_sources after do_configure
|
||||
|
||||
Reference in New Issue
Block a user