diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sanity.bbclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index d296c861b2..720777a399 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -21,7 +21,7 @@ def check_conf_exists(fn, data): | |||
21 | return True | 21 | return True |
22 | return False | 22 | return False |
23 | 23 | ||
24 | def check_sanity_sstate_dir_change(sstate_dir): | 24 | def check_sanity_sstate_dir_change(sstate_dir, data): |
25 | # Sanity checks to be done when the value of SSTATE_DIR changes | 25 | # Sanity checks to be done when the value of SSTATE_DIR changes |
26 | 26 | ||
27 | # Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS) | 27 | # Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS) |
@@ -30,14 +30,14 @@ def check_sanity_sstate_dir_change(sstate_dir): | |||
30 | testmsg = check_create_long_filename(sstate_dir, "SSTATE_DIR") | 30 | testmsg = check_create_long_filename(sstate_dir, "SSTATE_DIR") |
31 | return testmsg | 31 | return testmsg |
32 | 32 | ||
33 | def check_sanity_tmpdir_change(tmpdir): | 33 | def check_sanity_tmpdir_change(tmpdir, data): |
34 | # Sanity checks to be done when the value of TMPDIR changes | 34 | # Sanity checks to be done when the value of TMPDIR changes |
35 | 35 | ||
36 | # Check that TMPDIR isn't on a filesystem with limited filename length (eg. eCryptFS) | 36 | # Check that TMPDIR isn't on a filesystem with limited filename length (eg. eCryptFS) |
37 | testmsg = check_create_long_filename(tmpdir, "TMPDIR") | 37 | testmsg = check_create_long_filename(tmpdir, "TMPDIR") |
38 | return testmsg | 38 | return testmsg |
39 | 39 | ||
40 | def check_sanity_version_change(): | 40 | def check_sanity_version_change(data): |
41 | # Sanity checks to be done when SANITY_VERSION changes | 41 | # Sanity checks to be done when SANITY_VERSION changes |
42 | return "" | 42 | return "" |
43 | 43 | ||
@@ -266,14 +266,14 @@ def check_sanity(e): | |||
266 | 266 | ||
267 | sanity_version = int(data.getVar('SANITY_VERSION', e.data, True) or 1) | 267 | sanity_version = int(data.getVar('SANITY_VERSION', e.data, True) or 1) |
268 | if last_sanity_version < sanity_version: | 268 | if last_sanity_version < sanity_version: |
269 | messages = messages + check_sanity_version_change() | 269 | messages = messages + check_sanity_version_change(e.data) |
270 | messages = messages + check_sanity_tmpdir_change(tmpdir) | 270 | messages = messages + check_sanity_tmpdir_change(tmpdir, e.data) |
271 | messages = messages + check_sanity_sstate_dir_change(sstate_dir) | 271 | messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data) |
272 | else: | 272 | else: |
273 | if last_tmpdir != tmpdir: | 273 | if last_tmpdir != tmpdir: |
274 | messages = messages + check_sanity_tmpdir_change(tmpdir) | 274 | messages = messages + check_sanity_tmpdir_change(tmpdir, e.data) |
275 | if last_sstate_dir != sstate_dir: | 275 | if last_sstate_dir != sstate_dir: |
276 | messages = messages + check_sanity_sstate_dir_change(sstate_dir) | 276 | messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data) |
277 | 277 | ||
278 | if os.path.exists("conf"): | 278 | if os.path.exists("conf"): |
279 | f = file(sanityverfile, 'w') | 279 | f = file(sanityverfile, 'w') |