summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/archive-configured-source.bbclass25
-rw-r--r--meta/classes/archive-original-source.bbclass25
-rw-r--r--meta/classes/archive-patched-source.bbclass25
-rw-r--r--meta/classes/archiver.bbclass4
4 files changed, 27 insertions, 52 deletions
diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass
index 0f2c9ee329..d346f69e29 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -24,24 +24,17 @@ python () {
24 return 24 return
25 25
26 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging) 26 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging)
27 build_deps = ' %s:do_dumpdata_create_diff_gz' %pn
27 28
28 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm': 29 if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts':
29 """ 30 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
30 If package type is not 'srpm' then add tasks to move archive packages of 31 build_deps += ' %s:do_archive_scripts_logs' %pn
31 configured sources and scripts/logs in ${DEPLOY_DIR}/sources. 32
32 """ 33 if not not_tarball(d):
33 d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn) 34 d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn)
34 build_deps = ' %s:do_dumpdata_create_diff_gz' %pn 35 build_deps += ' %s:do_archive_configured_sources' %pn
35 if not not_tarball(d): 36
36 build_deps += ' %s:do_archive_configured_sources' %pn 37 d.appendVarFlag('do_build', 'depends', build_deps)
37 if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts':
38 build_deps += ' %s:do_archive_scripts_logs' %pn
39 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
40 d.appendVarFlag('do_build', 'depends', build_deps)
41
42 else:
43 d.prependVarFlag('do_configure', 'postfuncs', "do_archive_configured_sources")
44 d.prependVarFlag('do_package_write_rpm', 'prefuncs', "do_archive_scripts_logs")
45} 38}
46 39
47ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" 40ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass
index 1e138ce2fa..7258293c93 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -24,24 +24,17 @@ python () {
24 return 24 return
25 25
26 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging) 26 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging)
27 build_deps = ' %s:do_dumpdata_create_diff_gz' %pn
27 28
28 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm': 29 if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts':
29 """ 30 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
30 If package type is not 'srpm' then add tasks to move archive packages of 31 build_deps += ' %s:do_archive_scripts_logs' %pn
31 original sources and scripts/logs in ${DEPLOY_DIR}/sources. 32
32 """ 33 if not not_tarball(d):
33 d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn) 34 d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn)
34 build_deps = ' %s:do_dumpdata_create_diff_gz' %pn 35 build_deps += ' %s:do_archive_original_sources_patches' %pn
35 if not not_tarball(d): 36
36 build_deps += ' %s:do_archive_original_sources_patches' %pn 37 d.appendVarFlag('do_build', 'depends', build_deps)
37 if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts':
38 build_deps += ' %s:do_archive_scripts_logs' %pn
39 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
40 d.appendVarFlag('do_build', 'depends', build_deps)
41
42 else:
43 d.prependVarFlag('do_unpack', 'postfuncs', "do_archive_original_sources_patches")
44 d.prependVarFlag('do_package_write_rpm', 'prefuncs', "do_archive_scripts_logs")
45} 38}
46 39
47ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" 40ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
diff --git a/meta/classes/archive-patched-source.bbclass b/meta/classes/archive-patched-source.bbclass
index ac6d2c39f1..9e5ec74f45 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -24,24 +24,17 @@ python () {
24 return 24 return
25 25
26 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging) 26 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging)
27 build_deps = ' %s:do_dumpdata_create_diff_gz' %pn
27 28
28 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm': 29 if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts':
29 """ 30 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
30 If package type is not 'srpm' then add tasks to move archive packages of 31 build_deps += ' %s:do_archive_scripts_logs' %pn
31 patched sources and scripts/logs in ${DEPLOY_DIR}/sources. 32
32 """ 33 if not not_tarball(d):
33 d.appendVarFlag('do_configure', 'depends', ' %s:do_archive_patched_sources' %pn) 34 d.appendVarFlag('do_configure', 'depends', ' %s:do_archive_patched_sources' %pn)
34 build_deps = ' %s:do_dumpdata_create_diff_gz' %pn 35 build_deps += ' %s:do_archive_patched_sources' %pn
35 if not not_tarball(d): 36
36 build_deps += ' %s:do_archive_patched_sources' %pn 37 d.appendVarFlag('do_build', 'depends', build_deps)
37 if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts':
38 build_deps += ' %s:do_archive_scripts_logs' %pn
39 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
40 d.appendVarFlag('do_build', 'depends', build_deps)
41
42 else:
43 d.prependVarFlag('do_patch', 'postfuncs', "do_archive_patched_sources")
44 d.prependVarFlag('do_package_write_rpm', 'prefuncs', "do_archive_scripts_logs")
45} 38}
46 39
47ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" 40ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index ed07b2edb8..6749d61678 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -440,10 +440,6 @@ def archive_scripts_logs(d):
440 tarlog = archive_logs(d, logdir, True) 440 tarlog = archive_logs(d, logdir, True)
441 441
442 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm': 442 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm':
443 if os.path.exists(work_dir+ '/' + tarlog):
444 os.remove(work_dir+ '/' + tarlog)
445 shutil.move(os.path.join(logdir, '..', tarlog), work_dir)
446 shutil.rmtree(os.path.join(work_dir,'script-logs'))
447 store_package(d, tarlog) 443 store_package(d, tarlog)
448 444
449def dumpdata(d): 445def dumpdata(d):