summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMuhammad Shakeel <muhammad_shakeel@mentor.com>2013-02-20 18:50:57 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-28 23:15:45 +0000
commit98d82a5dcb5f2aec39c2fbaac6d2121e98d3da6e (patch)
tree56eb2fadb45b0e44fa5618a6e69bcdc777012bed /meta/classes
parent2b1afa10bc633c8153881921c181d0ad9b7060f0 (diff)
downloadpoky-98d82a5dcb5f2aec39c2fbaac6d2121e98d3da6e.tar.gz
archive-*-source.bbclass: Handle all package classes
* Add archiver tasks correctly for any 'IMAGE_PKGTYPE'. [YOCTO #3449] (From OE-Core rev: 0783686c4dc837674a2bcf3ca1f3f4858e256195) Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/archive-configured-source.bbclass10
-rw-r--r--meta/classes/archive-original-source.bbclass10
-rw-r--r--meta/classes/archive-patched-source.bbclass10
3 files changed, 21 insertions, 9 deletions
diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass
index e492ce300d..4fc5129c9d 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -11,22 +11,26 @@ inherit archiver
11addtask do_archive_configured_sources after do_configure 11addtask do_archive_configured_sources after do_configure
12 12
13# Get archiving package with temp(logs) and scripts(.bb and inc files) 13# Get archiving package with temp(logs) and scripts(.bb and inc files)
14addtask do_archive_scripts_logs after do_package_write_rpm 14addtask do_archive_scripts_logs
15 15
16# Get dump date and create diff file 16# Get dump date and create diff file
17addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build 17addtask do_dumpdata_create_diff_gz before do_build
18 18
19python () { 19python () {
20 pn = d.getVar('PN', True)
21 packaging = d.getVar('IMAGE_PKGTYPE', True)
22 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging)
23
20 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm': 24 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
21 """ 25 """
22 If package type is not 'srpm' then add tasks to move archive packages of 26 If package type is not 'srpm' then add tasks to move archive packages of
23 configured sources and scripts/logs in ${DEPLOY_DIR}/sources. 27 configured sources and scripts/logs in ${DEPLOY_DIR}/sources.
24 """ 28 """
25 pn = d.getVar('PN', True)
26 d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn) 29 d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn)
27 build_deps = ' %s:do_archive_configured_sources' %pn 30 build_deps = ' %s:do_archive_configured_sources' %pn
28 build_deps += ' %s:do_archive_scripts_logs' %pn 31 build_deps += ' %s:do_archive_scripts_logs' %pn
29 d.appendVarFlag('do_build', 'depends', build_deps) 32 d.appendVarFlag('do_build', 'depends', build_deps)
33 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
30 34
31 else: 35 else:
32 d.prependVarFlag('do_configure', 'postfuncs', "do_archive_configured_sources") 36 d.prependVarFlag('do_configure', 'postfuncs', "do_archive_configured_sources")
diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass
index f123cafcb0..3aea4f468f 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -11,22 +11,26 @@ inherit archiver
11addtask do_archive_original_sources_patches after do_unpack 11addtask do_archive_original_sources_patches after do_unpack
12 12
13# Get archiving package with temp(logs) and scripts(.bb and inc files) 13# Get archiving package with temp(logs) and scripts(.bb and inc files)
14addtask do_archive_scripts_logs after do_package_write_rpm 14addtask do_archive_scripts_logs
15 15
16# Get dump date and create diff file 16# Get dump date and create diff file
17addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build 17addtask do_dumpdata_create_diff_gz before do_build
18 18
19python () { 19python () {
20 pn = d.getVar('PN', True)
21 packaging = d.getVar('IMAGE_PKGTYPE', True)
22 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging)
23
20 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm': 24 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
21 """ 25 """
22 If package type is not 'srpm' then add tasks to move archive packages of 26 If package type is not 'srpm' then add tasks to move archive packages of
23 original sources and scripts/logs in ${DEPLOY_DIR}/sources. 27 original sources and scripts/logs in ${DEPLOY_DIR}/sources.
24 """ 28 """
25 pn = d.getVar('PN', True)
26 d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn) 29 d.appendVarFlag('do_patch', 'depends', ' %s:do_archive_original_sources_patches' %pn)
27 build_deps = ' %s:do_archive_original_sources_patches' %pn 30 build_deps = ' %s:do_archive_original_sources_patches' %pn
28 build_deps += ' %s:do_archive_scripts_logs' %pn 31 build_deps += ' %s:do_archive_scripts_logs' %pn
29 d.appendVarFlag('do_build', 'depends', build_deps) 32 d.appendVarFlag('do_build', 'depends', build_deps)
33 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
30 34
31 else: 35 else:
32 d.prependVarFlag('do_unpack', 'postfuncs', "do_archive_original_sources_patches") 36 d.prependVarFlag('do_unpack', 'postfuncs', "do_archive_original_sources_patches")
diff --git a/meta/classes/archive-patched-source.bbclass b/meta/classes/archive-patched-source.bbclass
index f9f558e652..d7ed6c8785 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -11,22 +11,26 @@ inherit archiver
11addtask do_archive_patched_sources after do_patch 11addtask do_archive_patched_sources after do_patch
12 12
13# Get archiving package with logs(temp) and scripts(.bb and .inc files) 13# Get archiving package with logs(temp) and scripts(.bb and .inc files)
14addtask do_archive_scripts_logs after do_package_write_rpm 14addtask do_archive_scripts_logs
15 15
16# Get dump date and create diff file 16# Get dump date and create diff file
17addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build 17addtask do_dumpdata_create_diff_gz before do_build
18 18
19python () { 19python () {
20 pn = d.getVar('PN', True)
21 packaging = d.getVar('IMAGE_PKGTYPE', True)
22 d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging)
23
20 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm': 24 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
21 """ 25 """
22 If package type is not 'srpm' then add tasks to move archive packages of 26 If package type is not 'srpm' then add tasks to move archive packages of
23 patched sources and scripts/logs in ${DEPLOY_DIR}/sources. 27 patched sources and scripts/logs in ${DEPLOY_DIR}/sources.
24 """ 28 """
25 pn = d.getVar('PN', True)
26 d.appendVarFlag('do_configure', 'depends', ' %s:do_archive_patched_sources' %pn) 29 d.appendVarFlag('do_configure', 'depends', ' %s:do_archive_patched_sources' %pn)
27 build_deps = ' %s:do_archive_patched_sources' %pn 30 build_deps = ' %s:do_archive_patched_sources' %pn
28 build_deps += ' %s:do_archive_scripts_logs' %pn 31 build_deps += ' %s:do_archive_scripts_logs' %pn
29 d.appendVarFlag('do_build', 'depends', build_deps) 32 d.appendVarFlag('do_build', 'depends', build_deps)
33 d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
30 34
31 else: 35 else:
32 d.prependVarFlag('do_patch', 'postfuncs', "do_archive_patched_sources") 36 d.prependVarFlag('do_patch', 'postfuncs', "do_archive_patched_sources")