Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

sanity.bbclass: add check for changed bb_persist_data.sqlite3 location

* 4f88334 could move
  bb_persist_data.sqlite3 from default CACHE tmp/cache/machine/
  to global tmp/cache/
* because I have 1st report of wrong SRCPV behavior, add sanity check from
  http://patches.openembedded.org/patch/823/
  even without moving it outside TMPDIR, in case of CACHE != PERSISTENT_DIR

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  • Loading branch information...
commit 3e7790be2b18e0a65cc5415b468b1fda7c9c58ab 1 parent b3aa538
@shr-project shr-project authored shr-project committed
Showing with 10 additions and 0 deletions.
  1. +9 −0 classes/sanity.bbclass
  2. +1 −0  conf/sanity.conf
View
9 classes/sanity.bbclass
@@ -186,6 +186,15 @@ def check_sanity(e):
messages = messages + "Error, Your PACKAGE_ARCHS field contains duplicates. Perhaps you set PACKAGE_EXTRA_ARCHS twice accidently through some tune file?\n"
break
+ #
+ # Check there isn't old persistent cache
+ #
+ cache = data.getVar('CACHE', e.data, True)
+ persistent_dir = data.getVar('PERSISTENT_DIR', e.data, True)
+ persistent_cache_filename = data.getVar('SANITY_PERSIST_DATA_FILE', e.data, True)
+ if cache != persistent_dir and os.path.exists(cache + '/' + persistent_cache_filename):
+ messages = messages + "Error, persistent cache file '%s' exists in old location '%s', please migrate it to new location '%s' and merge them together if you have one for each MACHINE.\n" % (persistent_cache_filename, cache, persistent_dir)
+
if messages != "":
raise_sanity_error(messages)
View
1  conf/sanity.conf
@@ -7,5 +7,6 @@ BB_MIN_VERSION = "1.10.2"
SANITY_ABIFILE = "${TMPDIR}/abi_version"
SANITY_PRFILE = "${TMPDIR}/distro_pr"
+SANITY_PERSIST_DATA_FILE = "bb_persist_data.sqlite3"
INHERIT += "sanity"
Please sign in to comment.
Something went wrong with that request. Please try again.