From b6bf8da1a58541fef58862e9c783d9bdad0d5c83 Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 12 Apr 2022 14:01:21 +0800 Subject: 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 Change-Id: If57d0ded9fac41e23b31b01e2a0e309ac7388148 --- meta-amd/meta-ethanolx/conf/local.conf.sample | 8 ++++---- meta-ampere/meta-jade/conf/local.conf.sample | 8 ++++---- meta-asrock/meta-e3c246d4i/conf/local.conf.sample | 8 ++++---- meta-bytedance/meta-g220a/conf/local.conf.sample | 8 ++++---- meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample | 8 ++++---- meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample | 8 ++++---- meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample | 8 ++++---- meta-evb/meta-evb-raspberrypi/conf/local.conf.sample | 8 ++++---- meta-facebook/meta-bletchley/conf/local.conf.sample | 8 ++++---- meta-facebook/meta-tiogapass/conf/local.conf.sample | 8 ++++---- meta-facebook/meta-yosemitev2/conf/local.conf.sample | 8 ++++---- meta-fii/meta-kudo/conf/local.conf.sample | 8 ++++---- meta-fii/meta-mori/conf/local.conf.sample | 8 ++++---- meta-hpe/meta-dl360poc/conf/local.conf.sample | 8 ++++---- meta-ibm/conf/local.conf.sample | 8 ++++---- meta-ibm/meta-palmetto/conf/local.conf.sample | 8 ++++---- meta-ibm/meta-romulus/conf/local.conf.sample | 8 ++++---- meta-ingrasys/meta-zaius/conf/local.conf.sample | 8 ++++---- meta-inspur/meta-fp5280g2/conf/local.conf.sample | 8 ++++---- meta-inspur/meta-on5263m5/conf/local.conf.sample | 8 ++++---- meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample | 8 ++++---- meta-inventec/meta-transformers/conf/local.conf.sample | 8 ++++---- meta-phosphor/conf/local.conf.sample | 8 ++++---- meta-quanta/meta-f0b/conf/local.conf.sample | 8 ++++---- meta-quanta/meta-gbs/conf/local.conf.sample | 8 ++++---- meta-quanta/meta-gsj/conf/local.conf.sample | 8 ++++---- meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample | 8 ++++---- meta-quanta/meta-q71l/conf/local.conf.sample | 8 ++++---- meta-quanta/meta-s6q/conf/local.conf.sample | 8 ++++---- meta-supermicro/meta-x11spi/conf/local.conf.sample | 8 ++++---- meta-tyan/meta-s7106/conf/local.conf.sample | 8 ++++---- meta-tyan/meta-s8036/conf/local.conf.sample | 8 ++++---- meta-wistron/meta-lannister/conf/local.conf.sample | 8 ++++---- meta-yadro/meta-nicole/conf/local.conf.sample | 8 ++++---- meta-yadro/meta-vegman/conf/local.conf.sample | 8 ++++---- 35 files changed, 140 insertions(+), 140 deletions(-) diff --git a/meta-amd/meta-ethanolx/conf/local.conf.sample b/meta-amd/meta-ethanolx/conf/local.conf.sample index ae0ecf276b..cdc6cef77e 100644 --- a/meta-amd/meta-ethanolx/conf/local.conf.sample +++ b/meta-amd/meta-ethanolx/conf/local.conf.sample @@ -195,10 +195,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-ampere/meta-jade/conf/local.conf.sample b/meta-ampere/meta-jade/conf/local.conf.sample index 3002e1491d..4fb2cbd6c3 100644 --- a/meta-ampere/meta-jade/conf/local.conf.sample +++ b/meta-ampere/meta-jade/conf/local.conf.sample @@ -173,10 +173,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample index b36c439c2b..3d40532850 100644 --- a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample +++ b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample @@ -10,10 +10,10 @@ 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" INHERIT += "extrausers" EXTRA_USERS_PARAMS = " \ diff --git a/meta-bytedance/meta-g220a/conf/local.conf.sample b/meta-bytedance/meta-g220a/conf/local.conf.sample index b83b7f8140..95e52585b9 100644 --- a/meta-bytedance/meta-g220a/conf/local.conf.sample +++ b/meta-bytedance/meta-g220a/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-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample index f4d2b3b0e2..bef2b45460 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample @@ -10,10 +10,10 @@ 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" INHERIT += "extrausers" EXTRA_USERS_PARAMS = " \ diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample index 387ea77da6..21cb261415 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample @@ -10,10 +10,10 @@ 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" INHERIT += "extrausers" EXTRA_USERS_PARAMS = " \ diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample index 9847926f56..c838d27483 100644 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample +++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample @@ -10,10 +10,10 @@ 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" INHERIT += "extrausers" EXTRA_USERS_PARAMS = " \ diff --git a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample index b46503e67f..86d2c78ad3 100644 --- a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample +++ b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample @@ -10,10 +10,10 @@ 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" # Set the root password to '0penBmc' diff --git a/meta-facebook/meta-bletchley/conf/local.conf.sample b/meta-facebook/meta-bletchley/conf/local.conf.sample index 82d4632346..17faa4a5e6 100644 --- a/meta-facebook/meta-bletchley/conf/local.conf.sample +++ b/meta-facebook/meta-bletchley/conf/local.conf.sample @@ -176,10 +176,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-facebook/meta-tiogapass/conf/local.conf.sample b/meta-facebook/meta-tiogapass/conf/local.conf.sample index 51b08d01ca..2786d161fc 100644 --- a/meta-facebook/meta-tiogapass/conf/local.conf.sample +++ b/meta-facebook/meta-tiogapass/conf/local.conf.sample @@ -176,10 +176,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-facebook/meta-yosemitev2/conf/local.conf.sample b/meta-facebook/meta-yosemitev2/conf/local.conf.sample index 7c38360375..562d2f3268 100644 --- a/meta-facebook/meta-yosemitev2/conf/local.conf.sample +++ b/meta-facebook/meta-yosemitev2/conf/local.conf.sample @@ -176,10 +176,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample index f485bb649a..fc4d82b43d 100644 --- a/meta-fii/meta-kudo/conf/local.conf.sample +++ b/meta-fii/meta-kudo/conf/local.conf.sample @@ -10,9 +10,9 @@ 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-fii/meta-mori/conf/local.conf.sample b/meta-fii/meta-mori/conf/local.conf.sample index 3ecba3c2b5..b7fd499b5c 100644 --- a/meta-fii/meta-mori/conf/local.conf.sample +++ b/meta-fii/meta-mori/conf/local.conf.sample @@ -10,9 +10,9 @@ 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-hpe/meta-dl360poc/conf/local.conf.sample b/meta-hpe/meta-dl360poc/conf/local.conf.sample index 805c5bfbfe..b6fb462da4 100644 --- a/meta-hpe/meta-dl360poc/conf/local.conf.sample +++ b/meta-hpe/meta-dl360poc/conf/local.conf.sample @@ -176,10 +176,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample index d68ee13ba2..f73f5d5af9 100644 --- a/meta-ibm/conf/local.conf.sample +++ b/meta-ibm/conf/local.conf.sample @@ -13,8 +13,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-ibm/meta-palmetto/conf/local.conf.sample b/meta-ibm/meta-palmetto/conf/local.conf.sample index d2f4b86185..dec7ef4237 100644 --- a/meta-ibm/meta-palmetto/conf/local.conf.sample +++ b/meta-ibm/meta-palmetto/conf/local.conf.sample @@ -196,10 +196,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-ibm/meta-romulus/conf/local.conf.sample index cc900bf6e8..61e8504902 100644 --- a/meta-ibm/meta-romulus/conf/local.conf.sample +++ b/meta-ibm/meta-romulus/conf/local.conf.sample @@ -176,10 +176,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/local.conf.sample index 146172540e..c1f13abcd1 100644 --- a/meta-ingrasys/meta-zaius/conf/local.conf.sample +++ b/meta-ingrasys/meta-zaius/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-inspur/meta-fp5280g2/conf/local.conf.sample b/meta-inspur/meta-fp5280g2/conf/local.conf.sample index c84a34ba59..6558d8b911 100644 --- a/meta-inspur/meta-fp5280g2/conf/local.conf.sample +++ b/meta-inspur/meta-fp5280g2/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-inspur/meta-on5263m5/conf/local.conf.sample b/meta-inspur/meta-on5263m5/conf/local.conf.sample index 683666b432..4693038e9e 100644 --- a/meta-inspur/meta-on5263m5/conf/local.conf.sample +++ b/meta-inspur/meta-on5263m5/conf/local.conf.sample @@ -193,10 +193,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample index 94e1612385..85c6d5ee72 100644 --- a/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample +++ b/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample @@ -174,10 +174,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-inventec/meta-transformers/conf/local.conf.sample b/meta-inventec/meta-transformers/conf/local.conf.sample index 45a7e2585f..c48b3fcbc9 100755 --- a/meta-inventec/meta-transformers/conf/local.conf.sample +++ b/meta-inventec/meta-transformers/conf/local.conf.sample @@ -176,10 +176,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/local.conf.sample index 98e6bd20f5..b24f032647 100644 --- a/meta-phosphor/conf/local.conf.sample +++ b/meta-phosphor/conf/local.conf.sample @@ -10,10 +10,10 @@ 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" MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode" diff --git a/meta-quanta/meta-f0b/conf/local.conf.sample b/meta-quanta/meta-f0b/conf/local.conf.sample index 147d6ced09..e6e074d45e 100644 --- a/meta-quanta/meta-f0b/conf/local.conf.sample +++ b/meta-quanta/meta-f0b/conf/local.conf.sample @@ -10,9 +10,9 @@ 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" INHERIT += "extrausers" diff --git a/meta-quanta/meta-gbs/conf/local.conf.sample b/meta-quanta/meta-gbs/conf/local.conf.sample index 21afe26ae1..7125616ce3 100644 --- a/meta-quanta/meta-gbs/conf/local.conf.sample +++ b/meta-quanta/meta-gbs/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-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/local.conf.sample index 6cff5ea4d7..95664912fb 100644 --- a/meta-quanta/meta-gsj/conf/local.conf.sample +++ b/meta-quanta/meta-gsj/conf/local.conf.sample @@ -10,9 +10,9 @@ 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-quanta/meta-olympus-nuvoton/conf/local.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample index 73cac5b982..6a70da03f8 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample +++ b/meta-quanta/meta-olympus-nuvoton/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-quanta/meta-q71l/conf/local.conf.sample b/meta-quanta/meta-q71l/conf/local.conf.sample index 99b70cc45f..278fc4db26 100644 --- a/meta-quanta/meta-q71l/conf/local.conf.sample +++ b/meta-quanta/meta-q71l/conf/local.conf.sample @@ -10,10 +10,10 @@ 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" INHERIT += "extrausers" EXTRA_USERS_PARAMS = " \ diff --git a/meta-quanta/meta-s6q/conf/local.conf.sample b/meta-quanta/meta-s6q/conf/local.conf.sample index d8bfba5cc8..eb2fe7a9d3 100644 --- a/meta-quanta/meta-s6q/conf/local.conf.sample +++ b/meta-quanta/meta-s6q/conf/local.conf.sample @@ -176,10 +176,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-supermicro/meta-x11spi/conf/local.conf.sample b/meta-supermicro/meta-x11spi/conf/local.conf.sample index fc8db0a963..584e6585a3 100644 --- a/meta-supermicro/meta-x11spi/conf/local.conf.sample +++ b/meta-supermicro/meta-x11spi/conf/local.conf.sample @@ -174,10 +174,10 @@ 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" # # Shared-state files from other locations 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" diff --git a/meta-wistron/meta-lannister/conf/local.conf.sample b/meta-wistron/meta-lannister/conf/local.conf.sample index 7a25c39a37..e0c0ca5280 100644 --- a/meta-wistron/meta-lannister/conf/local.conf.sample +++ b/meta-wistron/meta-lannister/conf/local.conf.sample @@ -10,9 +10,9 @@ 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-yadro/meta-nicole/conf/local.conf.sample b/meta-yadro/meta-nicole/conf/local.conf.sample index 4a91b28ffb..65875b07b4 100644 --- a/meta-yadro/meta-nicole/conf/local.conf.sample +++ b/meta-yadro/meta-nicole/conf/local.conf.sample @@ -176,10 +176,10 @@ 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" # # Shared-state files from other locations diff --git a/meta-yadro/meta-vegman/conf/local.conf.sample b/meta-yadro/meta-vegman/conf/local.conf.sample index 6df5ccec31..3f0f05054c 100644 --- a/meta-yadro/meta-vegman/conf/local.conf.sample +++ b/meta-yadro/meta-vegman/conf/local.conf.sample @@ -176,10 +176,10 @@ 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" # # Shared-state files from other locations -- cgit v1.2.3