summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-01 22:13:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-01 22:18:14 +0100
commitf27ddf0de23871fc72cfc31f514f0e144aaa2082 (patch)
treec23e74b089ab2eda3a1e91ba092cd58fd9f6d9ce
parent968973d55d4b33e1a929ed4cdf9387fcaba2d93f (diff)
downloadopenembedded-core-contrib-f27ddf0de23871fc72cfc31f514f0e144aaa2082.tar.gz
openembedded-core-contrib-f27ddf0de23871fc72cfc31f514f0e144aaa2082.tar.bz2
openembedded-core-contrib-f27ddf0de23871fc72cfc31f514f0e144aaa2082.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass3
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)}"
def get_lic_checksum_file_list(d):
filelist = []
lic_files = d.getVar("LIC_FILES_CHKSUM", True) or ''
+ tmpdir = d.getVar("TMPDIR", True)
urls = lic_files.split()
for url in urls:
@@ -105,6 +106,8 @@ def get_lic_checksum_file_list(d):
try:
path = bb.fetch.decodeurl(url)[2]
if path[0] == '/':
+ if path.startswith(tmpdir):
+ continue
filelist.append(path + ":" + str(os.path.exists(path)))
except bb.fetch.MalformedUrl:
raise bb.build.FuncFailed(d.getVar('PN', True) + ": LIC_FILES_CHKSUM contains an invalid URL: " + url)