From: Muhammad Shakeel <muhammad_shak...@mentor.com>
* Add archiver tasks correctly for any 'IMAGE_PKGTYPE'.
[YOCTO #3449]
Signed-off-by: Muhammad Shakeel <muhammad_shak...@mentor.com>
Signed-off-by: Noor Ahsan <noor_ah...@mentor.com>
Signed-off-by: Christopher Larson <chris_lar...@mentor.com>
---
meta/classes/archive-configured-source.bbclass | 15 +++++++++++++--
meta/classes/archive-original-source.bbclass | 15 +++++++++++++--
meta/classes/archive-patched-source.bbclass | 15 +++++++++++++--
3 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/meta/classes/archive-configured-source.bbclass
b/meta/classes/archive-configured-source.bbclass
index 64799e3..50838e6 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -11,12 +11,19 @@ inherit archiver
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 after do_package_write_rpm
+addtask do_archive_scripts_logs
# Get dump date and create diff file
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
python () {
+ packaging = d.getVar('IMAGE_PKGTYPE', True)
+ write_package_task = 'do_package_write_' + packaging
+
+ deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
+ deps.append(write_package_task)
+ d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
+
if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
"""
If package type is not 'srpm' then add tasks to move archive packages
of
@@ -30,6 +37,10 @@ python () {
recrdeptask += ' do_archive_configured_sources '
d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
+ deps = d.getVarFlag('do_archive_scripts_logs', 'deps') or []
+ deps.append(write_package_task)
+ d.setVarFlag('do_archive_scripts_logs', 'deps', deps)
+
deps = d.getVarFlag('do_build', 'deps') or []
deps.append('do_archive_scripts_logs')
d.setVarFlag('do_build', 'deps', deps)
diff --git a/meta/classes/archive-original-source.bbclass
b/meta/classes/archive-original-source.bbclass
index 44dffb4..77f9650 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -11,12 +11,19 @@ inherit archiver
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 after do_package_write_rpm
+addtask do_archive_scripts_logs
# Get dump date and create diff file
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
python () {
+ packaging = d.getVar('IMAGE_PKGTYPE', True)
+ write_package_task = 'do_package_write_' + packaging
+
+ deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
+ deps.append(write_package_task)
+ d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
+
if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
"""
If package type is not 'srpm' then add tasks to move archive packages
of
@@ -30,6 +37,10 @@ python () {
recrdeptask += ' do_archive_original_sources_patches '
d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
+ deps = d.getVarFlag('do_archive_scripts_logs', 'deps') or []
+ deps.append(write_package_task)
+ d.setVarFlag('do_archive_scripts_logs', 'deps', deps)
+
deps = d.getVarFlag('do_build', 'deps') or []
deps.append('do_archive_scripts_logs')
d.setVarFlag('do_build', 'deps', deps)
diff --git a/meta/classes/archive-patched-source.bbclass
b/meta/classes/archive-patched-source.bbclass
index 35bae54..11dd547 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -11,12 +11,19 @@ inherit archiver
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 after do_package_write_rpm
+addtask do_archive_scripts_logs
# Get dump date and create diff file
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
python () {
+ packaging = d.getVar('IMAGE_PKGTYPE', True)
+ write_package_task = 'do_package_write_' + packaging
+
+ deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
+ deps.append(write_package_task)
+ d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
+
if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
"""
If package type is not 'srpm' then add tasks to move archive packages
of
@@ -30,6 +37,10 @@ python () {
recrdeptask += ' do_archive_patched_sources '
d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
+ deps = d.getVarFlag('do_archive_scripts_logs', 'deps') or []
+ deps.append(write_package_task)
+ d.setVarFlag('do_archive_scripts_logs', 'deps', deps)
+
deps = d.getVarFlag('do_build', 'deps') or []
deps.append('do_archive_scripts_logs')
d.setVarFlag('do_build', 'deps', deps)
--
1.7.9.5
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
