diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2017-08-29 02:54:00 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-16 00:03:14 +0100 |
commit | a3ae69755be0ca825ea24448a6f4c54a765d5b3c (patch) | |
tree | 83ed6c0c7ddf934c0a3a0883579db4e31e5f57a6 /meta/classes/image.bbclass | |
parent | 24a4b7114bf937ffb38b7696e75cf6ea917026a7 (diff) | |
download | poky-a3ae69755be0ca825ea24448a6f4c54a765d5b3c.tar.gz |
image.bbclass: delete DATE variable too
When creating a custom image which uses the DATE variable the basehash
seems to change every day and lead to errors such as:
ERROR: console-tdx-image-2.7.6-r0 do_image_customimg: Error executing a python function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
0001:
*** 0002:set_image_size(d)
...
Add DATE to the variables which should not get expanded early and to the
vardepsexclude list for the image task.
(From OE-Core rev: 4af13a4855c74cea9cf6c168fd73165d7094bf93)
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2c1dc8145d..7949b465a3 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -437,6 +437,7 @@ python () { | |||
437 | # date/time values. It will get expanded at execution time. | 437 | # date/time values. It will get expanded at execution time. |
438 | # Similarly TMPDIR since otherwise we see QA stamp comparision problems | 438 | # Similarly TMPDIR since otherwise we see QA stamp comparision problems |
439 | localdata.delVar('DATETIME') | 439 | localdata.delVar('DATETIME') |
440 | localdata.delVar('DATE') | ||
440 | localdata.delVar('TMPDIR') | 441 | localdata.delVar('TMPDIR') |
441 | 442 | ||
442 | image_cmd = localdata.getVar("IMAGE_CMD") | 443 | image_cmd = localdata.getVar("IMAGE_CMD") |
@@ -501,7 +502,7 @@ python () { | |||
501 | d.prependVarFlag(task, 'postfuncs', ' create_symlinks') | 502 | d.prependVarFlag(task, 'postfuncs', ' create_symlinks') |
502 | d.appendVarFlag(task, 'subimages', ' ' + ' '.join(subimages)) | 503 | d.appendVarFlag(task, 'subimages', ' ' + ' '.join(subimages)) |
503 | d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps)) | 504 | d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps)) |
504 | d.appendVarFlag(task, 'vardepsexclude', 'DATETIME') | 505 | d.appendVarFlag(task, 'vardepsexclude', 'DATETIME DATE') |
505 | 506 | ||
506 | bb.debug(2, "Adding task %s before %s, after %s" % (task, 'do_image_complete', after)) | 507 | bb.debug(2, "Adding task %s before %s, after %s" % (task, 'do_image_complete', after)) |
507 | bb.build.addtask(task, 'do_image_complete', after, d) | 508 | bb.build.addtask(task, 'do_image_complete', after, d) |