sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

sanity: Don't make assumptions about cwd 

When using the recently fixed out of build directory bitbake invocations, I was
puzzled why bitbake seemed to be pausing. The reason was due to running the sanity
tests each and every time. This was due to current working directory assumptions
within the sanity test code. Fix this to use TOPDIR.

(From OE-Core rev: 1cdc1b37b840bda961258cf2bfb2f75331bdb310)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-09-01 16:19:32 +01:00
parent 554c892ccf
commit 5894ac1f38
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/classes/sanity.bbclass
View File

@ -694,7 +694,7 @@ def check_sanity(sanity_data):
last_sanity_version = 0
last_tmpdir = ""
last_sstate_dir = ""
sanityverfile = 'conf/sanity_info'
sanityverfile = sanity_data.expand("${TOPDIR}/conf/sanity_info")
if os.path.exists(sanityverfile):
with open(sanityverfile, 'r') as f:
for line in f:
@ -715,7 +715,8 @@ def check_sanity(sanity_data):
else:
if last_sstate_dir != sstate_dir:
status.addresult(check_sanity_sstate_dir_change(sstate_dir, sanity_data))
if os.path.exists("conf") and not status.messages:
if os.path.exists(os.path.dirname(sanityverfile)) and not status.messages:
with open(sanityverfile, 'w') as f:
f.write("SANITY_VERSION %s\n" % sanity_version)
f.write("TMPDIR %s\n" % tmpdir)