Re: [OE-core] [PATCH] base: Fix license checksum rebuild problems

[Christopher Larson]

On Mon, Jun 1, 2015 at 2:13 PM, Richard Purdie 
richard.pur...@linuxfoundation.org wrote:

 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.pur...@linuxfoundation.org

 diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
 index 99b512b..7093a19 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


Hmm, this would probably never be a real issue, but this is using a string
startswith() without a path separator, meaning it’d match e.g.
/path/to/tmpfoo/ as well as /path/to/tmp/ :)
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] base: Fix license checksum rebuild problems

[Richard Purdie]

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.pur...@linuxfoundation.org

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 99b512b..7093a19 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)


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core