summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-06 10:02:10 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-06 10:07:45 +0000
commitbddb60b101df0b2a26a9dcb1202e95f46835a731 (patch)
tree6f4d652ef56a78a3eeea495e1387ae93bdc01160
parent1083d90888589b9f0d50a1d480f7c774d8b4bda3 (diff)
downloadpoky-bddb60b101df0b2a26a9dcb1202e95f46835a731.tar.gz
poky-bddb60b101df0b2a26a9dcb1202e95f46835a731.tar.bz2
poky-bddb60b101df0b2a26a9dcb1202e95f46835a731.zip
local.conf.sample: Weakly set BB_DISKMON_DIRS
For various reasons we need to be able to set and override this from auto.conf on our test infrastructure. We have tried forcing the variable but this then breaks other selftests. In the interests of not complicating things further and needing to modify the tests across releases, weaken the default assignment. (From meta-yocto rev: 5eea5239b3172b147bdef8023d1c5a8981d18f7e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-poky/conf/local.conf.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample
index a7b2d8065d..b25b6a2a00 100644
--- a/meta-poky/conf/local.conf.sample
+++ b/meta-poky/conf/local.conf.sample
@@ -192,7 +192,7 @@ PATCHRESOLVE = "noop"
# files and damages the build in ways which may not be easily recoverable.
# It's necesary to monitor /tmp, if there is no space left the build will fail
# with very exotic errors.
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
STOPTASKS,${TMPDIR},1G,100K \
STOPTASKS,${DL_DIR},1G,100K \
STOPTASKS,${SSTATE_DIR},1G,100K \