summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2020-01-07 22:10:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-28 11:15:02 (GMT)
commit4fc93977e9ab8d5cf63f383a77610515bd3f032e (patch)
treeb804bcaa82176c0c69795def94c8f53beb945108
parentdeb84639381ad6d90893beeb6c5d03f547c07ad9 (diff)
downloadpoky-4fc93977e9ab8d5cf63f383a77610515bd3f032e.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: a63d59f64a2d1f450a7639426cae8e0373a2d764) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f98103b548aa7dba6b1be6c8e02ef41858a8e85c) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.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 9429202..3b41c69 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -919,7 +919,7 @@ def check_sanity(sanity_data):
919 last_tmpdir = "" 919 last_tmpdir = ""
920 last_sstate_dir = "" 920 last_sstate_dir = ""
921 last_nativelsbstr = "" 921 last_nativelsbstr = ""
922 sanityverfile = sanity_data.expand("${TOPDIR}/conf/sanity_info") 922 sanityverfile = sanity_data.expand("${TOPDIR}/cache/sanity_info")
923 if os.path.exists(sanityverfile): 923 if os.path.exists(sanityverfile):
924 with open(sanityverfile, 'r') as f: 924 with open(sanityverfile, 'r') as f:
925 for line in f: 925 for line in f:
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index 3b2fed5..5f1805d 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