diff options
| author | Marek Vasut <marex@denx.de> | 2016-04-15 12:19:46 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-18 16:28:21 +0100 |
| commit | 9d2d1ae5a91f1a28dca708dd3b6f6bd90ff233f5 (patch) | |
| tree | 0c1faf9d4bbc8ac49c842023ea6d99b1a5dd8183 /meta | |
| parent | 4693593cc5f36de052d4abeda6ca16a9f235fb5a (diff) | |
| download | poky-9d2d1ae5a91f1a28dca708dd3b6f6bd90ff233f5.tar.gz | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index f1b409cf11..e5b75edf5b 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
| @@ -215,6 +215,7 @@ do_assemble_fitimage() { | |||
| 215 | 215 | ||
| 216 | addtask assemble_fitimage before do_install after do_compile | 216 | addtask assemble_fitimage before do_install after do_compile |
| 217 | 217 | ||
| 218 | kernel_do_deploy[vardepsexclude] = "DATETIME" | ||
| 218 | kernel_do_deploy_append() { | 219 | kernel_do_deploy_append() { |
| 219 | # Update deploy directory | 220 | # Update deploy directory |
| 220 | if test "x${KERNEL_IMAGETYPE}" = "xfitImage" ; then | 221 | if test "x${KERNEL_IMAGETYPE}" = "xfitImage" ; then |