mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-12 22:42:54 +02:00
general code formatting cleanup in shell scripts
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
+11
-16
@@ -46,10 +46,9 @@ init_check()
|
||||
[ ! -d "release/${version}/roms/" ] || \
|
||||
rm -Rf "release/${version}/roms/" || \
|
||||
err "init_check: !rm -Rf release/${version}/roms/"
|
||||
if [ ! -d "release/${version}/roms/" ]; then
|
||||
mkdir -p "release/${version}/roms/" || \
|
||||
err "init_check: !mkdir -p release/${version}/roms/"
|
||||
fi
|
||||
[ -d "release/${version}/roms/" ] && return 0
|
||||
mkdir -p "release/${version}/roms/" || \
|
||||
err "init_check: !mkdir -p release/${version}/roms/"
|
||||
}
|
||||
|
||||
make_archive()
|
||||
@@ -161,20 +160,17 @@ strip_archive()
|
||||
strip_ucode()
|
||||
{
|
||||
romfile=${1}
|
||||
|
||||
_newrom_b="${romfile%.rom}_nomicrocode.tmprom"
|
||||
cp "${romfile}" "${_newrom_b}" || \
|
||||
err "strip_rom_image: cp \"${romfile}\" \"${_newrom_b}\""
|
||||
microcode_present="y"
|
||||
"${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}" \
|
||||
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
|
||||
[ "${microcode_present}" = "n" ] || return 0
|
||||
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}"
|
||||
}
|
||||
|
||||
strip_rom_image()
|
||||
@@ -196,10 +192,9 @@ strip_rom_image()
|
||||
err "strip_rom_images: ${1}: can't nuke ecfw2.bin"
|
||||
fi
|
||||
# TODO: replace this board-specific hack
|
||||
if [ "${target}" = "e6400_4mb" ]; then
|
||||
"${cbfstool}" "${1}" remove -n "pci10de,06eb.rom" || \
|
||||
err "strip_rom_images: ${1}: can't nuke e6400 vga rom"
|
||||
fi
|
||||
[ "${target}" = "e6400_4mb" ] || return 0
|
||||
"${cbfstool}" "${1}" remove -n "pci10de,06eb.rom" || \
|
||||
err "strip_rom_images: ${1}: can't nuke e6400 vga rom"
|
||||
}
|
||||
|
||||
main $@
|
||||
|
||||
@@ -36,7 +36,6 @@ main()
|
||||
purge_files
|
||||
|
||||
create_release_archive
|
||||
|
||||
printf "Source code archive available at %s.tar.xz\n\n" "${srcdir}"
|
||||
}
|
||||
|
||||
@@ -116,9 +115,7 @@ copy_files()
|
||||
purge_files()
|
||||
{
|
||||
(
|
||||
cd "${srcdir}/" || \
|
||||
err "purge_files 3: !cd ${srcdir}/"
|
||||
|
||||
cd "${srcdir}/" || err "purge_files 3: !cd ${srcdir}/"
|
||||
[ ! -d "coreboot/default/util/kbc1126" ] || \
|
||||
./handle make file -c "coreboot/default/util/kbc1126" || \
|
||||
err "purge_files 1: default/util/kbc1126: ! make clean"
|
||||
@@ -128,7 +125,6 @@ purge_files()
|
||||
./handle make config -c "${p}" || \
|
||||
err "purge_files: ${p}: cannot clean the source trees"
|
||||
done
|
||||
|
||||
for p in bios_extract flashrom grub uefitool; do
|
||||
./handle make file -c "${p}" || \
|
||||
err "purge_files: !./handle make file -c ${p}"
|
||||
|
||||
Reference in New Issue
Block a user