diff options
author | Scott Murray <scott.murray@konsulko.com> | 2022-02-17 17:15:03 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 23:37:27 +0000 |
commit | 8cc8380074091b09229264ca9048b538c2fc1640 (patch) | |
tree | 84af85a819be39946beb6dcf6e1110894d592fb1 | |
parent | d58ab954849986599290a0ca4745d2fca7e6ae15 (diff) | |
download | poky-8cc8380074091b09229264ca9048b538c2fc1640.tar.gz |
meta-poky: Update BB_DISKMON_DIRS use
Update the example BB_DISKMON_DIRS definitions in the sample
local.conf files for the rename of the "ABORT" action to "HALT".
(From meta-yocto rev: f7dc69745e3dbd5cf0d4950c44169b26c30b1902)
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-poky/conf/local.conf.sample | 10 | ||||
-rw-r--r-- | meta-poky/conf/local.conf.sample.extended | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample index dc7891988f..55e90e008e 100644 --- a/meta-poky/conf/local.conf.sample +++ b/meta-poky/conf/local.conf.sample | |||
@@ -184,7 +184,7 @@ PATCHRESOLVE = "noop" | |||
184 | # | 184 | # |
185 | # Monitor the disk space during the build. If there is less that 1GB of space or less | 185 | # Monitor the disk space during the build. If there is less that 1GB of space or less |
186 | # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully | 186 | # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully |
187 | # shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort | 187 | # shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt |
188 | # of the build. The reason for this is that running completely out of space can corrupt | 188 | # of the build. The reason for this is that running completely out of space can corrupt |
189 | # files and damages the build in ways which may not be easily recoverable. | 189 | # files and damages the build in ways which may not be easily recoverable. |
190 | # It's necessary to monitor /tmp, if there is no space left the build will fail | 190 | # It's necessary to monitor /tmp, if there is no space left the build will fail |
@@ -194,10 +194,10 @@ BB_DISKMON_DIRS ??= "\ | |||
194 | STOPTASKS,${DL_DIR},1G,100K \ | 194 | STOPTASKS,${DL_DIR},1G,100K \ |
195 | STOPTASKS,${SSTATE_DIR},1G,100K \ | 195 | STOPTASKS,${SSTATE_DIR},1G,100K \ |
196 | STOPTASKS,/tmp,100M,100K \ | 196 | STOPTASKS,/tmp,100M,100K \ |
197 | ABORT,${TMPDIR},100M,1K \ | 197 | HALT,${TMPDIR},100M,1K \ |
198 | ABORT,${DL_DIR},100M,1K \ | 198 | HALT,${DL_DIR},100M,1K \ |
199 | ABORT,${SSTATE_DIR},100M,1K \ | 199 | HALT,${SSTATE_DIR},100M,1K \ |
200 | ABORT,/tmp,10M,1K" | 200 | HALT,/tmp,10M,1K" |
201 | 201 | ||
202 | # | 202 | # |
203 | # Shared-state files from other locations | 203 | # Shared-state files from other locations |
diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/local.conf.sample.extended index 8a384540f9..1e3699ef8e 100644 --- a/meta-poky/conf/local.conf.sample.extended +++ b/meta-poky/conf/local.conf.sample.extended | |||
@@ -195,7 +195,7 @@ DISTRO_FEATURES:remove = "x11" | |||
195 | # "action,directory,minimum_space,minimum_free_inode" | 195 | # "action,directory,minimum_space,minimum_free_inode" |
196 | # | 196 | # |
197 | # The "action" must be set and should be one of: | 197 | # The "action" must be set and should be one of: |
198 | # ABORT: Immediately abort | 198 | # HALT: Immediately halt |
199 | # STOPTASKS: The new tasks can't be executed any more, will stop the build | 199 | # STOPTASKS: The new tasks can't be executed any more, will stop the build |
200 | # when the running tasks have been done. | 200 | # when the running tasks have been done. |
201 | # WARN: show warnings (see BB_DISKMON_WARNINTERVAL for more information) | 201 | # WARN: show warnings (see BB_DISKMON_WARNINTERVAL for more information) |