summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2020-01-07 23:10:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-10 21:18:22 +0000
commit2f90c165aa93c00d504775b6cea77e88c7011690 (patch)
treed7d216e62e16086d5580fcf3e8d3efd2f0120f38
parenta2983a263548302821787683bc260af40e01ab11 (diff)
downloadpoky-2f90c165aa93c00d504775b6cea77e88c7011690.tar.gz
sanity.bbclass: Move sanity_info from conf to cache
Since this file is written during recipe parsing, having it in the ${BUILDDIR}/conf directory, which is covered by an inotify watcher, will trigger a re-parse the next time bitbake is run and the resident bitbake server is enabled. This causes the sanity_info file to be updated again, which triggers a new parse the next time bitbake is run ad infinitum. Moving it to ${BUILDDIR}/cache should avoid this. (From OE-Core rev: f98103b548aa7dba6b1be6c8e02ef41858a8e85c) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/lib/oeqa/buildperf/base.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 63ab6cf3df..5c2f8f9d75 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -929,7 +929,7 @@ def check_sanity(sanity_data):
929 last_tmpdir = "" 929 last_tmpdir = ""
930 last_sstate_dir = "" 930 last_sstate_dir = ""
931 last_nativelsbstr = "" 931 last_nativelsbstr = ""
932 sanityverfile = sanity_data.expand("${TOPDIR}/conf/sanity_info") 932 sanityverfile = sanity_data.expand("${TOPDIR}/cache/sanity_info")
933 if os.path.exists(sanityverfile): 933 if os.path.exists(sanityverfile):
934 with open(sanityverfile, 'r') as f: 934 with open(sanityverfile, 'r') as f:
935 for line in f: 935 for line in f:
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index 3b2fed549f..5f1805d86c 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -462,7 +462,7 @@ class BuildPerfTestCase(unittest.TestCase):
462 def rm_tmp(self): 462 def rm_tmp(self):
463 """Cleanup temporary/intermediate files and directories""" 463 """Cleanup temporary/intermediate files and directories"""
464 log.debug("Removing temporary and cache files") 464 log.debug("Removing temporary and cache files")
465 for name in ['bitbake.lock', 'conf/sanity_info', 465 for name in ['bitbake.lock', 'cache/sanity_info',
466 self.bb_vars['TMPDIR']]: 466 self.bb_vars['TMPDIR']]:
467 oe.path.remove(name, recurse=True) 467 oe.path.remove(name, recurse=True)
468 468