diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-05-07 15:31:14 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-09 10:53:54 +0100 |
commit | 63319a2091c3f3ad2c16e7aa803e0ed8668ae397 (patch) | |
tree | 91b87b42a2b24c563a41852e1b9d504edd58bcc5 /meta/classes | |
parent | bb70038b852c488a34279c04236325080e78951d (diff) | |
download | poky-63319a2091c3f3ad2c16e7aa803e0ed8668ae397.tar.gz |
archive-*-source.bbclass: handle dependency in anonymous function
Using "before do_rootfs" would have this task added to do_rootfs
dependencies regardless of the filtering options. Instead, add this
dependency in the anonymous python function.
(From OE-Core master rev: 2400a74923e51e17ecfa94c2d63908b0b2aac76a)
(From OE-Core rev: 94ba93a04099866af91bfc86dca0633e7fef8ffb)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/archive-configured-source.bbclass | 7 | ||||
-rw-r--r-- | meta/classes/archive-original-source.bbclass | 7 | ||||
-rw-r--r-- | meta/classes/archive-patched-source.bbclass | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass index a481b141db..54c234406a 100644 --- a/meta/classes/archive-configured-source.bbclass +++ b/meta/classes/archive-configured-source.bbclass | |||
@@ -14,7 +14,7 @@ addtask do_archive_configured_sources after do_configure | |||
14 | addtask do_archive_scripts_logs | 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 before do_rootfs | 17 | addtask do_dumpdata_create_diff_gz |
18 | 18 | ||
19 | python () { | 19 | python () { |
20 | pn = d.getVar('PN', True) | 20 | pn = d.getVar('PN', True) |
@@ -34,7 +34,10 @@ python () { | |||
34 | d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn) | 34 | d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn) |
35 | build_deps += ' %s:do_archive_configured_sources' %pn | 35 | build_deps += ' %s:do_archive_configured_sources' %pn |
36 | 36 | ||
37 | d.appendVarFlag('do_build', 'depends', build_deps) | 37 | if bb.data.inherits_class('image', d): |
38 | d.appendVarFlag('do_rootfs', 'depends', build_deps) | ||
39 | else: | ||
40 | d.appendVarFlag('do_build', 'depends', build_deps) | ||
38 | } | 41 | } |
39 | 42 | ||
40 | ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" | 43 | ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" |
diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass index 2796ff9600..7e9ed6d111 100644 --- a/meta/classes/archive-original-source.bbclass +++ b/meta/classes/archive-original-source.bbclass | |||
@@ -14,7 +14,7 @@ addtask do_archive_original_sources_patches after do_unpack | |||
14 | addtask do_archive_scripts_logs | 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 before do_rootfs | 17 | addtask do_dumpdata_create_diff_gz |
18 | 18 | ||
19 | python () { | 19 | python () { |
20 | pn = d.getVar('PN', True) | 20 | pn = d.getVar('PN', True) |
@@ -34,7 +34,10 @@ python () { | |||
34 | 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) |
35 | build_deps += ' %s:do_archive_original_sources_patches' %pn | 35 | build_deps += ' %s:do_archive_original_sources_patches' %pn |
36 | 36 | ||
37 | d.appendVarFlag('do_build', 'depends', build_deps) | 37 | if bb.data.inherits_class('image', d): |
38 | d.appendVarFlag('do_rootfs', 'depends', build_deps) | ||
39 | else: | ||
40 | d.appendVarFlag('do_build', 'depends', build_deps) | ||
38 | } | 41 | } |
39 | 42 | ||
40 | ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" | 43 | ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" |
diff --git a/meta/classes/archive-patched-source.bbclass b/meta/classes/archive-patched-source.bbclass index 995a259473..d8d494a45d 100644 --- a/meta/classes/archive-patched-source.bbclass +++ b/meta/classes/archive-patched-source.bbclass | |||
@@ -14,7 +14,7 @@ addtask do_archive_patched_sources after do_patch | |||
14 | addtask do_archive_scripts_logs | 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 before do_rootfs | 17 | addtask do_dumpdata_create_diff_gz |
18 | 18 | ||
19 | python () { | 19 | python () { |
20 | pn = d.getVar('PN', True) | 20 | pn = d.getVar('PN', True) |
@@ -34,7 +34,10 @@ python () { | |||
34 | d.appendVarFlag('do_configure', 'depends', ' %s:do_archive_patched_sources' %pn) | 34 | d.appendVarFlag('do_configure', 'depends', ' %s:do_archive_patched_sources' %pn) |
35 | build_deps += ' %s:do_archive_patched_sources' %pn | 35 | build_deps += ' %s:do_archive_patched_sources' %pn |
36 | 36 | ||
37 | d.appendVarFlag('do_build', 'depends', build_deps) | 37 | if bb.data.inherits_class('image', d): |
38 | d.appendVarFlag('do_rootfs', 'depends', build_deps) | ||
39 | else: | ||
40 | d.appendVarFlag('do_build', 'depends', build_deps) | ||
38 | } | 41 | } |
39 | 42 | ||
40 | ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" | 43 | ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/" |