summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-05-03 12:01:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-22 17:14:01 +0100
commit1a7201545bac7f65b8de3fc5b8084fe8cad9da5d (patch)
tree07b4c1bce4d8e7b52cf7a923dbd28e4c42409ccd
parent28be9becfb0c61d7b9872d5178ffeaa44fa376b8 (diff)
downloadpoky-1a7201545bac7f65b8de3fc5b8084fe8cad9da5d.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 master rev: cd90be31571178d6822dba5a94a2795209a3576c) (From OE-Core rev: c283ab637c7e0501a309dbe9abdf14ad70834c9b) 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.bbclass2
-rw-r--r--meta/classes/archive-original-source.bbclass2
-rw-r--r--meta/classes/archive-patched-source.bbclass2
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
14addtask do_archive_scripts_logs 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 17addtask do_dumpdata_create_diff_gz before do_rootfs
18 18
19python () { 19python () {
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
14addtask do_archive_scripts_logs 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 17addtask do_dumpdata_create_diff_gz before do_rootfs
18 18
19python () { 19python () {
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
14addtask do_archive_scripts_logs 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 17addtask do_dumpdata_create_diff_gz before do_rootfs
18 18
19python () { 19python () {
20 pn = d.getVar('PN', True) 20 pn = d.getVar('PN', True)