summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-09-09 23:15:17 +0100
committerLeah Rowe <leah@libreboot.org>2023-09-09 23:15:17 +0100
commit84bf47b5b947a8ed5afa1fb5335266d04ee3b004 (patch)
tree48e7512bececf2fc03f7d2eba4b45cd36bf219f4
parentb78009e28aab38bc149be5c57aa23505b8dd2a08 (diff)
scripts: better handling of printf: stdout/stderr
in some cases, messages that should be considered errors or warnings, were being written to the standard output, rather than written as error messages. also: one or two printf statements should specifically avoid printing errors (to any file); in these cases, stdout has been redirected to /dev/null Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xlbmk2
-rwxr-xr-xscript/build/command/options2
-rwxr-xr-xscript/build/release/roms6
-rwxr-xr-xscript/handle/make/config2
-rwxr-xr-xscript/update/blobs/download3
-rwxr-xr-xscript/update/blobs/mrc4
6 files changed, 10 insertions, 9 deletions
diff --git a/lbmk b/lbmk
index 3abbd470..f29a9a94 100755
--- a/lbmk
+++ b/lbmk
@@ -86,7 +86,7 @@ main()
fail "Invalid mode '${mode}'. Run: ${0} help"
elif [ ! -f "${buildpath}/${mode}/${option}" ]; then
usage $0
- printf "Invalid option for '%s'." ${mode}
+ printf "Invalid option for '%s'." ${mode} 1>&2
fail "Run: ${0} ${mode} list'."
fi
"${buildpath}/${mode}/${option}" $@ || fail "lbmk error"
diff --git a/script/build/command/options b/script/build/command/options
index 84a9a3fb..dd22078f 100755
--- a/script/build/command/options
+++ b/script/build/command/options
@@ -22,7 +22,7 @@ listitems()
# -e used because this is for files *or* directories
[ -e "${x}" ] || continue
[ "${x##*/}" = "build.list" ] && continue
- printf "%s\n" "${x##*/}"
+ printf "%s\n" "${x##*/}" 2>/dev/null
items=0
done
return ${items}
diff --git a/script/build/release/roms b/script/build/release/roms
index c551c1aa..da67f8ed 100755
--- a/script/build/release/roms
+++ b/script/build/release/roms
@@ -191,9 +191,9 @@ strip_ucode()
"${cbfstool}" "${_newrom_b}" remove -n \
cpu_microcode_blob.bin 2>/dev/null || microcode_present="n"
if [ "${microcode_present}" = "n" ]; then
- printf "REMARK: '%s' already lacks microcode\n" \
- "${romfile}"
- printf "Renaming default ROM file instead.\n"
+ printf "REMARK: '%s' already lacks microcode\n" "${romfile}" \
+ 1>&2
+ printf "Renaming default ROM file instead.\n" 1>&2
mv "${romfile}" "${_newrom_b}" || \
err "strip_rom_image: can't rename no-u ${romfile}"
fi
diff --git a/script/handle/make/config b/script/handle/make/config
index 3b48c986..334e333e 100755
--- a/script/handle/make/config
+++ b/script/handle/make/config
@@ -114,7 +114,7 @@ handle_defconfig()
config="${y}"
config_name="${config#$target_dir/config/}"
- printf "build/defconfig/%s %s: handling config %s\n" \
+ printf "handle/make/config %s %s: handling config %s\n" \
"${project}" "${target}" "${config_name}"
[ "${mode}" != "all" ] || check_config || continue
diff --git a/script/update/blobs/download b/script/update/blobs/download
index b9c801a6..71c0cdb6 100755
--- a/script/update/blobs/download
+++ b/script/update/blobs/download
@@ -38,7 +38,8 @@ detect_firmware()
[ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" = "y" ] && \
needs="${needs} SCH5545EC"
[ -z ${needs+x} ] && \
- printf "No binary blobs needed for this board\n" && \
+ printf "No binary blobs needed for board: %s\n" "${board}" \
+ 1>&2 && \
return 1
printf "Firmware needed for board '%s':\n%s\n" "${board}" "${needs}"
}
diff --git a/script/update/blobs/mrc b/script/update/blobs/mrc
index e4de2be4..681b3699 100755
--- a/script/update/blobs/mrc
+++ b/script/update/blobs/mrc
@@ -62,11 +62,11 @@ check_existing()
{
[ -f "${_mrc_complete}" ] || \
return 0
- printf 'found existing mrc.bin\n'
+ printf "found existing mrc.bin\n" 1>&2
[ "$(sha512sum "${_mrc_complete}" | awk '{print $1}')" \
= "${_mrc_complete_hash}" ] && \
return 1
- printf 'hashes did not match, starting over\n'
+ printf "hashes did not match, starting over\n" 1>&2
}
build_dependencies()