From: Marek Vasut Date: Fri, 15 Apr 2016 10:19:46 +0000 (+0200) Subject: kernel: fitimage: Fix do_deploy taskhash mismatch X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~26136 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42ed25f693a4898f517c9ffc7920e5d994ac692d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git kernel: fitimage: Fix do_deploy taskhash mismatch The kernel_do_deploy_append() uses DATETIME variable , so the taskhash of the kernel_do_deploy() function changes if fitImage is used. The buildsystem will complain accordingly: ERROR: linux-yocto-4.4.3+gitAUTOINC+bcc6509084_1a72cec834-r0 do_deploy: Taskhash mismatch 49a5899a6895dcebd311dcb59870f370 verses 37c8dd3aae44134492a876f21c1b641b for /Yocto/poky/meta/recipes-kernel/linux/linux-yocto_4.4.bb.do_deploy ERROR: Taskhash mismatch 49a5899a6895dcebd311dcb59870f370 verses 37c8dd3aae44134492a876f21c1b641b for /Yocto/poky/meta/recipes-kernel/linux/linux-yocto_4.4.bb.do_deploy Fix this by excluding the DATETIME variable from the checksum. Signed-off-by: Marek Vasut Cc: Richard Purdie Signed-off-by: Ross Burton --- diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index f1b409cf119..e5b75edf5be 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -215,6 +215,7 @@ do_assemble_fitimage() { addtask assemble_fitimage before do_install after do_compile +kernel_do_deploy[vardepsexclude] = "DATETIME" kernel_do_deploy_append() { # Update deploy directory if test "x${KERNEL_IMAGETYPE}" = "xfitImage" ; then