canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "inject.sh: simplify remktar()" 

This reverts commit d61ad878ab.

The commit that this reverts, broke building release roms.

Signed-off-by: Leah Rowe <leah@libreboot.org>
25.06_branch^2
Leah Rowe 2025-05-27 21:42:31 +01:00
parent dd0f3d846f
commit a7752f9d0b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/inject.sh
View File

@ -13,7 +13,7 @@ cv="CONFIG_GBE_BIN_PATH"
[ -n "$cvchk" ] && cv="$cv $cvchk" [ -n "$cvchk" ] && cv="$cv $cvchk"
eval "`setvars "" archive boarddir IFD_platform ifdprefix tree new_mac \ eval "`setvars "" archive boarddir IFD_platform ifdprefix tree new_mac \
tdir board xchanged $cv`" tmpromdir board xchanged $cv`"
inject() inject()
{ {
@ -41,8 +41,7 @@ inject()
x_ e "$archive" f && check_release x_ e "$archive" f && check_release
check_target && patch_release check_target && patch_release
[ "$xchanged" != "y" ] || ( remktar ) || err [ "$xchanged" = "y" ] && remktar
x_ mv "${tdir%"/bin/$board"}/bin/${relname}_${board}.tar.xz" "$archive"
xnot=" NOT" && [ "$xchanged" = "y" ] && xnot="" xnot=" NOT" && [ "$xchanged" = "y" ] && xnot=""
printf "\n'%s' was%s modified\n" "$archive" "$xnot" 1>&2 printf "\n'%s' was%s modified\n" "$archive" "$xnot" 1>&2
@ -79,13 +78,13 @@ check_target()
patch_release() patch_release()
{ {
has_hashes="n" has_hashes="n"
tdir="$tmpromdel/bin/$board" tmpromdir="$tmpromdel/bin/$board"
remkdir "${tdir%"/bin/$board"}" remkdir "${tmpromdir%"/bin/$board"}"
x_ tar -xf "$archive" -C "${tdir%"/bin/$board"}" x_ tar -xf "$archive" -C "${tmpromdir%"/bin/$board"}"
for _hashes in "vendorhashes" "blobhashes"; do for _hashes in "vendorhashes" "blobhashes"; do
e "$tdir/$_hashes" f && err \ e "$tmpromdir/$_hashes" f && err \
"'$archive': vendorfile insertion unsupported"; : "'$archive': vendorfile insertion unsupported"; :
done done
@ -115,7 +114,7 @@ modify_mac()
x_ make -C util/nvmutil clean && x_ make -C util/nvmutil && \ x_ make -C util/nvmutil clean && x_ make -C util/nvmutil && \
x_ "$nvm" "$xbloc/gbe" setmac "$new_mac" x_ "$nvm" "$xbloc/gbe" setmac "$new_mac"
fx_ newmac x_ find "$tdir" -maxdepth 1 -type f -name "*.rom" fx_ newmac x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
printf "\nThe following GbE NVM data will be written:\n" printf "\nThe following GbE NVM data will be written:\n"
x_ "$nvm" "$xbloc/gbe" dump | grep -v "bytes read from file" || : x_ "$nvm" "$xbloc/gbe" dump | grep -v "bytes read from file" || :
@ -129,7 +128,12 @@ newmac()
remktar() remktar()
{ {
x_ cd "${tdir%"/bin/$board"}" (
x_ cd "${tmpromdir%"/bin/$board"}"
printf "Re-building tar archive (please wait)\n" printf "Re-building tar archive (please wait)\n"
mkrom_tarball "bin/$board" 1>/dev/null mkrom_tarball "bin/$board" 1>/dev/null
) || err "Cannot re-generate '$archive'"
mv "${tmpromdir%"/bin/$board"}/bin/${relname}_${board}.tar.xz" \
"$archive" || err "'$archive' -> Can't overwrite"; :
} }