diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-01 22:13:23 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-03 16:38:44 +0100 |
| commit | 2389d4c57d3f77f1732db184ba1fd433bf76a490 (patch) | |
| tree | f2f25d7ca50fa400de78ead607241a48460d7f3c | |
| parent | 5cc614ed68d9f763041e4d67134c5d7ada795978 (diff) | |
| download | poky-2389d4c57d3f77f1732db184ba1fd433bf76a490.tar.gz | |
base: Fix license checksum rebuild problems
"MACHINE=qemux86-64 bitbake init-ifupdown; MACHINE=genericx86-64 bitbake init-ifupdown"
shows a rebuild when it would be expected. The reason is a LIC_FILES_CHKSUM which
contains file://${WORKDIR}, an absolute path which doesn't exist in the first build
but does in the second, causing a signature change and a rebuild.
Fix the problem by ignoring any file:// url which resolves since TMPDIR for
license file dependency purposes.
(From OE-Core rev: f27ddf0de23871fc72cfc31f514f0e144aaa2082)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/base.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 2822a688f2..8637f9ffd6 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
| @@ -97,6 +97,7 @@ PATH_prepend = "${@extra_path_elements(d)}" | |||
| 97 | def get_lic_checksum_file_list(d): | 97 | def get_lic_checksum_file_list(d): |
| 98 | filelist = [] | 98 | filelist = [] |
| 99 | lic_files = d.getVar("LIC_FILES_CHKSUM", True) or '' | 99 | lic_files = d.getVar("LIC_FILES_CHKSUM", True) or '' |
| 100 | tmpdir = d.getVar("TMPDIR", True) | ||
| 100 | 101 | ||
| 101 | urls = lic_files.split() | 102 | urls = lic_files.split() |
| 102 | for url in urls: | 103 | for url in urls: |
| @@ -105,6 +106,8 @@ def get_lic_checksum_file_list(d): | |||
| 105 | try: | 106 | try: |
| 106 | path = bb.fetch.decodeurl(url)[2] | 107 | path = bb.fetch.decodeurl(url)[2] |
| 107 | if path[0] == '/': | 108 | if path[0] == '/': |
| 109 | if path.startswith(tmpdir): | ||
| 110 | continue | ||
| 108 | filelist.append(path + ":" + str(os.path.exists(path))) | 111 | filelist.append(path + ":" + str(os.path.exists(path))) |
| 109 | except bb.fetch.MalformedUrl: | 112 | except bb.fetch.MalformedUrl: |
| 110 | raise bb.build.FuncFailed(d.getVar('PN', True) + ": LIC_FILES_CHKSUM contains an invalid URL: " + url) | 113 | raise bb.build.FuncFailed(d.getVar('PN', True) + ": LIC_FILES_CHKSUM contains an invalid URL: " + url) |
