summaryrefslogtreecommitdiff
path: root/meta-tyan
diff options
context:
space:
mode:
authorGeorge Liu <liuxiwei@inspur.com>2022-04-12 09:01:21 +0300
committerPatrick Williams <patrick@stwcx.xyz>2022-04-12 19:58:47 +0300
commitb6bf8da1a58541fef58862e9c783d9bdad0d5c83 (patch)
tree214bc1128af4ab4b15d18348b398d8fcc16374e6 /meta-tyan
parenta59436c2b36756b9024326cd14f55471fb6ff4ce (diff)
downloadopenbmc-b6bf8da1a58541fef58862e9c783d9bdad0d5c83.tar.xz
treewide: Update BB_DISKMON_DIRS use
Per [1][2], Yocto is starting to deprecate ABORT and has replaced the "ABORT" action in BB_DISKMON_DIRS entries with "HALT". 1. https://wiki.yoctoproject.org/wiki/Inclusive_language 2. https://git.yoctoproject.org/poky/commit/?id=4f77505d94a8f6260933f457e9848d1d2fa98ce5 Tested: Built obmc-phosphor-image successfully and eliminate the following warnings: ``` WARNING: The BB_DISKMON_DIRS "ABORT" action has been renamed to "HALT", update configuration ``` Signed-off-by: George Liu <liuxiwei@inspur.com> Change-Id: If57d0ded9fac41e23b31b01e2a0e309ac7388148
Diffstat (limited to 'meta-tyan')
-rw-r--r--meta-tyan/meta-s7106/conf/local.conf.sample8
-rw-r--r--meta-tyan/meta-s8036/conf/local.conf.sample8
2 files changed, 8 insertions, 8 deletions
diff --git a/meta-tyan/meta-s7106/conf/local.conf.sample b/meta-tyan/meta-s7106/conf/local.conf.sample
index c9f35dbc3b..6a21206133 100644
--- a/meta-tyan/meta-s7106/conf/local.conf.sample
+++ b/meta-tyan/meta-s7106/conf/local.conf.sample
@@ -10,8 +10,8 @@ BB_DISKMON_DIRS = "\
STOPTASKS,${DL_DIR},1G,100K \
STOPTASKS,${SSTATE_DIR},1G,100K \
STOPTASKS,/tmp,100M,100K \
- ABORT,${TMPDIR},100M,1K \
- ABORT,${DL_DIR},100M,1K \
- ABORT,${SSTATE_DIR},100M,1K \
- ABORT,/tmp,10M,1K"
+ HALT,${TMPDIR},100M,1K \
+ HALT,${DL_DIR},100M,1K \
+ HALT,${SSTATE_DIR},100M,1K \
+ HALT,/tmp,10M,1K"
CONF_VERSION = "2"
diff --git a/meta-tyan/meta-s8036/conf/local.conf.sample b/meta-tyan/meta-s8036/conf/local.conf.sample
index f954b40a53..1cd5e9e910 100644
--- a/meta-tyan/meta-s8036/conf/local.conf.sample
+++ b/meta-tyan/meta-s8036/conf/local.conf.sample
@@ -10,8 +10,8 @@ BB_DISKMON_DIRS = "\
STOPTASKS,${DL_DIR},1G,100K \
STOPTASKS,${SSTATE_DIR},1G,100K \
STOPTASKS,/tmp,100M,100K \
- ABORT,${TMPDIR},100M,1K \
- ABORT,${DL_DIR},100M,1K \
- ABORT,${SSTATE_DIR},100M,1K \
- ABORT,/tmp,10M,1K"
+ HALT,${TMPDIR},100M,1K \
+ HALT,${DL_DIR},100M,1K \
+ HALT,${SSTATE_DIR},100M,1K \
+ HALT,/tmp,10M,1K"
CONF_VERSION = "2"