diff options
-rwxr-xr-x | include/err.sh | 9 | ||||
-rwxr-xr-x | script/build/roms | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/err.sh b/include/err.sh index 097d4230..0b1c3e70 100755 --- a/include/err.sh +++ b/include/err.sh @@ -5,7 +5,7 @@ export LC_COLLATE=C export LC_ALL=C version=""; versiondate=""; projectname=""; _nogit="" -err="err_"; tmpdir=""; release_type="" +err="err_"; tmpdir=""; release_type=""; lbmk_status="" # if "y": a coreboot target won't be built if target.cfg says release="n" # (this is used to exclude certain build targets from releases) @@ -26,6 +26,13 @@ set | grep LBMK_VERSION_TYPE 1>/dev/null 2>/dev/null && \ [ "$release_type" = "unstable" ] || release_type="" export LBMK_VERSION_TYPE="$release_type" +# if set to n via export, status checks will be skipped during +# all builds, and all targets will be built regardless of status. +# this replicates the old behaviour of lbmk, prior to the checks. +set | grep LBMK_STATUS 1>/dev/null 2>/dev/null && lbmk_status="$LBMK_STATUS" +[ "$lbmk_status" = "y" ] || [ "$lbmk_status" = "n" ] || lbmk_status="y" +export LBMK_STATUS="$lbmk_status" + tmpdir_was_set="y" set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n" if [ "${tmpdir_was_set}" = "y" ]; then diff --git a/script/build/roms b/script/build/roms index ea7ef62c..08b9c92a 100755 --- a/script/build/roms +++ b/script/build/roms @@ -190,7 +190,7 @@ skip_board() return 1 if [ "$lbmk_release" != "y" ] && [ "$status" != "stable" ] && \ - [ "$status" != "$release_type" ]; then + [ "$status" != "$release_type" ] && [ "$lbmk_status" = "y" ]; then if [ -f "$targetdir/warn.txt" ]; then printf "Regarding board '%s' (status '%s'):\n" \ "$board" "$status" |