From 5894ac1f38cdbc74b8197710bd64fc79b05aec87 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 1 Sep 2013 16:19:32 +0100 Subject: [PATCH] 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 --- meta/classes/sanity.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 4df3ca8001..feffed9431 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -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)