From 1e3a3275a27f0b53c4f202d9a425c7d624a65160 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 26 Feb 2022 16:23:46 +0100 Subject: local.conf: sync with meta-poky sample This follows variable renames and thus changes the layer's compatibility to only kirkstone. Signed-off-by: Max Krummenacher --- buildconf/local.conf | 12 ++++++------ conf/layer.conf | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildconf/local.conf b/buildconf/local.conf index 43bec06..2331f09 100644 --- a/buildconf/local.conf +++ b/buildconf/local.conf @@ -183,7 +183,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 than 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 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 necessary to monitor /tmp, if there is no space left the build will fail @@ -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 @@ -213,7 +213,7 @@ BB_DISKMON_DIRS ??= "\ # at the end as shown in the examples below. This will be substituted with the # correct path within the directory structure. #SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \ #file://.* file:///some/local/dir/sstate/PATH" # diff --git a/conf/layer.conf b/conf/layer.conf index 0da61b1..21f8785 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -12,4 +12,4 @@ BBFILE_PATTERN_IGNORE_EMPTY_meta-toradex-distro = "1" BBFILE_PRIORITY_meta-toradex-distro = "21" LAYERDEPENDS_meta-toradex-distro = "core yocto" -LAYERSERIES_COMPAT_meta-toradex-distro = "hardknott honister kirkstone" +LAYERSERIES_COMPAT_meta-toradex-distro = "kirkstone" -- cgit v1.2.3