mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-11 14:02:52 +02:00
lib.sh: add fe_ which is fx_ but err on find
In the mk script, we need fx_ to not return errors on the find command, since it's searching a bunch of directories where some of them may not exist. All other instances where fx_ is used, must return an error if the directory being searched doesn't exist. For this, fe_() is introduced, which does the same as fx_ but with this much stricter check. Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
+3
-3
@@ -283,7 +283,7 @@ extract_tbfw()
|
||||
chkvars TBFW_size # size in bytes, matching TBFW's flash IC
|
||||
x_ mkdir -p tmp
|
||||
|
||||
x_ rm -f tmp/tb.bin && fx_ copy_tbfw "$appdir" -type f -name "TBT.bin"
|
||||
x_ rm -f tmp/tb.bin && fe_ copy_tbfw "$appdir" -type f -name "TBT.bin"
|
||||
|
||||
x_ dd if=/dev/null of=tmp/tb.bin bs=1 seek=$TBFW_size
|
||||
x_ cp "tmp/tb.bin" "$_dest"
|
||||
@@ -421,7 +421,7 @@ patch_release_roms()
|
||||
x_ mkdir -p "tmp"
|
||||
|
||||
if readkconfig; then
|
||||
fx_ prep_rom "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
|
||||
fe_ prep_rom "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
|
||||
[ "$nukemode" != "nuke" ] || \
|
||||
printf "Make sure you inserted vendor files: %s\n" \
|
||||
"$vguide" > "$tmpromdir/README.md" || :
|
||||
@@ -571,7 +571,7 @@ modify_mac()
|
||||
[ "$new_mac" != "restore" ] && x_ make -C util/nvmutil && \
|
||||
x_ "$nvm" tmp/gbe setmac "$new_mac"
|
||||
|
||||
fx_ newmac "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
|
||||
fe_ newmac "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
|
||||
|
||||
printf "\nGbE NVM written to '%s':\n" "$archive"
|
||||
x_ "$nvm" tmp/gbe dump | grep -v "bytes read from file" || :
|
||||
|
||||
Reference in New Issue
Block a user