diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-05-03 12:01:04 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-03 16:19:20 +0100 |
commit | a8eca390019b569220d09d9c6d8039cb0898996b (patch) | |
tree | d55de59b173d67a45a5b8e0286b3dfff023503cb | |
parent | 140ba6247905094a0288d816b5085b6564c884c4 (diff) | |
download | poky-a8eca390019b569220d09d9c6d8039cb0898996b.tar.gz |
archive-*-source.bbclass: have do_dumpdata_create_diff_gz task run before do_rootfs
do_rootfs[cleandirs] contains ${S} and, if do_rootfs task starts before
the do_dumpdata_create_diff_gz is finished, an error will occur in the
process because the directory will be removed while still needed by the
create_diff_gz() function.
This patch will force the do_dumpdata_create_diff_gz task to run before
do_rootfs when the final image is created.
[YOCTO #4310]
(From OE-Core rev: cd90be31571178d6822dba5a94a2795209a3576c)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/archive-configured-source.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/archive-original-source.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/archive-patched-source.bbclass | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass index d346f69e29..a481b141db 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 | 17 | addtask do_dumpdata_create_diff_gz before do_rootfs |
18 | 18 | ||
19 | python () { | 19 | python () { |
20 | pn = d.getVar('PN', True) | 20 | pn = d.getVar('PN', True) |
diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass index 7258293c93..2796ff9600 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 | 17 | addtask do_dumpdata_create_diff_gz before do_rootfs |
18 | 18 | ||
19 | python () { | 19 | python () { |
20 | pn = d.getVar('PN', True) | 20 | pn = d.getVar('PN', True) |
diff --git a/meta/classes/archive-patched-source.bbclass b/meta/classes/archive-patched-source.bbclass index 9e5ec74f45..995a259473 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 | 17 | addtask do_dumpdata_create_diff_gz before do_rootfs |
18 | 18 | ||
19 | python () { | 19 | python () { |
20 | pn = d.getVar('PN', True) | 20 | pn = d.getVar('PN', True) |