aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-02-22 10:42:30 -0500
committerScott Murray <scott.murray@konsulko.com>2022-03-30 14:08:33 -0400
commit73c48ad8a6ec86af4dc87bc2a2679d2ce4566706 (patch)
treea8cde5a2bff33142c4cbc7547adfcf2504f56b15 /templates
parent9653de99a5452bb419f2f694553cfb66fabfbf01 (diff)
Update for kirkstone variable renames
Apply updates from running the new convert-variable-renames script from upstream, plus a few manual tweaks to the sample BB_DISKMON_DIRS configuration in the sample local.conf files to match the changes made in upstream. There are a few things outside of BitBake variables that the script still complains about that will need to be addressed in follow up changes. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I65e483043c1f2e48827e735cf8fdaec8d04e5fee
Diffstat (limited to 'templates')
-rw-r--r--templates/base/01_setup_pkg_revision.sh4
-rw-r--r--templates/base/local.conf.sample10
2 files changed, 7 insertions, 7 deletions
diff --git a/templates/base/01_setup_pkg_revision.sh b/templates/base/01_setup_pkg_revision.sh
index cba278d18..a9e4ceb8c 100644
--- a/templates/base/01_setup_pkg_revision.sh
+++ b/templates/base/01_setup_pkg_revision.sh
@@ -36,7 +36,7 @@ EOF
cat <<'EOF' >> $LOCALCONF
PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}"
PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}"
-BB_HASHBASE_WHITELIST:append = " PKGR PKGV"
+BB_BASEHASH_IGNORE_VARS:append = " PKGR PKGV"
EOF
;;
value:*)
@@ -44,7 +44,7 @@ EOF
cat <<'EOF' >> $LOCALCONF
PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}"
PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}"
-BB_HASHBASE_WHITELIST:append = " PKGR PKGV"
+BB_BASEHASH_IGNORE_VARS:append = " PKGR PKGV"
EOF
;;
none)
diff --git a/templates/base/local.conf.sample b/templates/base/local.conf.sample
index 1d0044871..7f2c0b11a 100644
--- a/templates/base/local.conf.sample
+++ b/templates/base/local.conf.sample
@@ -186,7 +186,7 @@ PATCHRESOLVE = "noop"
#
# Monitor the disk space during the build. If there is less that 1GB of space or less
# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
-# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
+# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard halt
# of the build. The reason for this is that running completely out of space can corrupt
# 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
@@ -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