diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/archive-configured-source.bbclass | 10 | ||||
-rw-r--r-- | meta/classes/archive-original-source.bbclass | 10 | ||||
-rw-r--r-- | meta/classes/archive-patched-source.bbclass | 10 |
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 | |||
11 | addtask do_archive_configured_sources after do_configure | 11 | addtask 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) |
14 | addtask do_archive_scripts_logs after do_package_write_rpm | 14 | addtask do_archive_scripts_logs |
15 | 15 | ||
16 | # Get dump date and create diff file | 16 | # Get dump date and create diff file |
17 | addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build | 17 | addtask do_dumpdata_create_diff_gz before do_build |
18 | 18 | ||
19 | python () { | 19 | python () { |
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 | |||
11 | addtask do_archive_original_sources_patches after do_unpack | 11 | addtask 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) |
14 | addtask do_archive_scripts_logs after do_package_write_rpm | 14 | addtask do_archive_scripts_logs |
15 | 15 | ||
16 | # Get dump date and create diff file | 16 | # Get dump date and create diff file |
17 | addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build | 17 | addtask do_dumpdata_create_diff_gz before do_build |
18 | 18 | ||
19 | python () { | 19 | python () { |
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 | |||
11 | addtask do_archive_patched_sources after do_patch | 11 | addtask 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) |
14 | addtask do_archive_scripts_logs after do_package_write_rpm | 14 | addtask do_archive_scripts_logs |
15 | 15 | ||
16 | # Get dump date and create diff file | 16 | # Get dump date and create diff file |
17 | addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build | 17 | addtask do_dumpdata_create_diff_gz before do_build |
18 | 18 | ||
19 | python () { | 19 | python () { |
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") |