coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-21 10:12:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

handle/make/config: run fail() on error, not err()

Browse Source 
This was an oversight, during a previous audit.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-09-24 18:57:01 +01:00
parent 2d0e978c94
commit 7966f9111d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/handle/make/config
+10 -10
View File
@@ -48,7 +48,7 @@ tree=""
cbfstool="" cbfstool=""
tmpclean="$(mktemp -d -t makeclean.XXXXXXXXXX)" || \ tmpclean="$(mktemp -d -t makeclean.XXXXXXXXXX)" || \
err "can't make tmpclean dir" fail "can't make tmpclean dir"
main() main()
{ {
@@ -262,7 +262,7 @@ run_make_command()
if [ -e "${codedir}/.git" ] && [ "${project}" = "u-boot" ] && \ if [ -e "${codedir}/.git" ] && [ "${project}" = "u-boot" ] && \
[ "${mode}" = "distclean" ]; then [ "${mode}" = "distclean" ]; then
git -C "${codedir}" clean -fdx || \ git -C "${codedir}" clean -fdx || \
err "run_make_command: ${codedir}: cannot clean u-boot git" fail "run_make_command: ${codedir}: cannot clean u-boot git"
elif [ "${mode}" = "oldconfig" ] || [ "${mode}" = "menuconfig" ]; then elif [ "${mode}" = "oldconfig" ] || [ "${mode}" = "menuconfig" ]; then
cp "${codedir}/.config" "${config}" || \ cp "${codedir}/.config" "${config}" || \
fail "run_make: can't edit config: ${project}/${target}" fail "run_make: can't edit config: ${project}/${target}"
@@ -273,7 +273,7 @@ copy_elf()
{ {
if [ "${project}" = "coreboot" ]; then if [ "${project}" = "coreboot" ]; then
modify_coreboot_rom || \ modify_coreboot_rom || \
err "copy_elf: cannot prepare coreboot image" fail "copy_elf: cannot prepare coreboot image"
fi fi
while read f; do while read f; do
@@ -290,34 +290,34 @@ modify_coreboot_rom()
{ {
rompath="${codedir}/build/coreboot.rom" rompath="${codedir}/build/coreboot.rom"
[ -f "${rompath}" ] || \ [ -f "${rompath}" ] || \
err "modify_coreboot_rom: does not exist: ${rompath}" fail "modify_coreboot_rom: does not exist: ${rompath}"
tmprom="$(mktemp -t rom.XXXXXXXXXX)" tmprom="$(mktemp -t rom.XXXXXXXXXX)"
rm -f "${tmprom}" || \ rm -f "${tmprom}" || \
err "modify_coreboot_rom prep: cannot remove tmprom" fail "modify_coreboot_rom prep: cannot remove tmprom"
if [ "${romtype}" = "d8d16sas" ]; then if [ "${romtype}" = "d8d16sas" ]; then
# pike2008 roms hang seabios. an empty rom will override # pike2008 roms hang seabios. an empty rom will override
# the built-in one, thus disabling all execution of it # the built-in one, thus disabling all execution of it
touch "${tmprom}" || \ touch "${tmprom}" || \
err "modify_coreboot_rom: cannot create fake oprom" fail "modify_coreboot_rom: cannot create fake oprom"
for deviceID in "0072" "3050"; do for deviceID in "0072" "3050"; do
"${cbfstool}" "${rompath}" add -f "${tmprom}" \ "${cbfstool}" "${rompath}" add -f "${tmprom}" \
-n "pci1000,${deviceID}.rom" -t raw || \ -n "pci1000,${deviceID}.rom" -t raw || \
err "modify_coreboot_rom: can't insert fake rom" fail "modify_coreboot_rom: can't insert fake rom"
done done
elif [ "${romtype}" = "i945 laptop" ]; then elif [ "${romtype}" = "i945 laptop" ]; then
# for bucts-based installation method from factory bios # for bucts-based installation method from factory bios
dd if="${rompath}" of="${tmprom}" bs=1 \ dd if="${rompath}" of="${tmprom}" bs=1 \
skip=$(($(stat -c %s "${rompath}") - 0x10000)) \ skip=$(($(stat -c %s "${rompath}") - 0x10000)) \
count=64k || \ count=64k || \
err "modify_coreboot_rom: can't read i945 bootblock" fail "modify_coreboot_rom: can't read i945 bootblock"
dd if="${tmprom}" of="${rompath}" bs=1 \ dd if="${tmprom}" of="${rompath}" bs=1 \
seek=$(($(stat -c %s "${rompath}") - 0x20000)) \ seek=$(($(stat -c %s "${rompath}") - 0x20000)) \
count=64k conv=notrunc || \ count=64k conv=notrunc || \
err "modify_coreboot_rom: can't write i945 bootblock" fail "modify_coreboot_rom: can't write i945 bootblock"
fi fi
rm -f "${tmprom}" || \ rm -f "${tmprom}" || \
err "modify_coreboot_rom: cannot remove tmprom" fail "modify_coreboot_rom: cannot remove tmprom"
} }
fail() fail()