diff options
author | Ross Burton <ross.burton@intel.com> | 2019-04-05 21:00:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-09 13:44:39 +0100 |
commit | bf7bd734d017321bcbcbb946b4e28946ee532837 (patch) | |
tree | bcd2f11630ae8ea504bc865d2126acc55b892699 | |
parent | 327513ee83499827b6f4a8fae2ba0336b65bb68a (diff) | |
download | poky-bf7bd734d017321bcbcbb946b4e28946ee532837.tar.gz |
sanity: clarify error message if TMPDIR moves
If TMPDIR is moved the error message says "move it back or rebuild" but the
obvious rebuild method of running 'bitbake [recipe]] -cclean' fails with the
same error.
Make it clear what we mean by adding "delete and".
(From OE-Core rev: 36805a628f8208ff6d7fba9955c5fb1ed6396395)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/sanity.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index cab0921401..4cbb1f3a61 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -876,7 +876,7 @@ def check_sanity_everybuild(status, d): | |||
876 | with open(checkfile, "r") as f: | 876 | with open(checkfile, "r") as f: |
877 | saved_tmpdir = f.read().strip() | 877 | saved_tmpdir = f.read().strip() |
878 | if (saved_tmpdir != tmpdir): | 878 | if (saved_tmpdir != tmpdir): |
879 | status.addresult("Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % saved_tmpdir) | 879 | status.addresult("Error, TMPDIR has changed location. You need to either move it back to %s or delete it and rebuild\n" % saved_tmpdir) |
880 | else: | 880 | else: |
881 | bb.utils.mkdirhier(tmpdir) | 881 | bb.utils.mkdirhier(tmpdir) |
882 | # Remove setuid, setgid and sticky bits from TMPDIR | 882 | # Remove setuid, setgid and sticky bits from TMPDIR |