aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2016-04-15 12:19:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-18 16:28:21 +0100
commit9d2d1ae5a91f1a28dca708dd3b6f6bd90ff233f5 (patch)
tree0c1faf9d4bbc8ac49c842023ea6d99b1a5dd8183
parent4693593cc5f36de052d4abeda6ca16a9f235fb5a (diff)
downloadopenembedded-core-contrib-9d2d1ae5a91f1a28dca708dd3b6f6bd90ff233f5.tar.gz
openembedded-core-contrib-9d2d1ae5a91f1a28dca708dd3b6f6bd90ff233f5.tar.bz2
openembedded-core-contrib-9d2d1ae5a91f1a28dca708dd3b6f6bd90ff233f5.zip
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. (From OE-Core rev: 42ed25f693a4898f517c9ffc7920e5d994ac692d) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-fitimage.bbclass1
1 files changed, 1 insertions, 0 deletions
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