coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-25 17:38:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

vendor.sh: use bsdunzip, not unzip

Browse Source 
most implementations of unzip are info-zip

we already compile libarchive for bsdtar, to extract
rar archives in vendor.sh

now we also use bsdunzip

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-09-28 11:27:16 +01:00
parent c6939cf390
commit b786918b2b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vendor.sh
+3 -2
View File
@@ -18,6 +18,7 @@ me7updateparser="$xbmkpwd/util/me7_update_parser/me7_update_parser.py"
pfs_extract="$xbmkpwd/src/biosutilities/Dell_PFS_Extract.py" pfs_extract="$xbmkpwd/src/biosutilities/Dell_PFS_Extract.py"
uefiextract="$xbmkpwd/elf/uefitool/uefiextract" uefiextract="$xbmkpwd/elf/uefitool/uefiextract"
bsdtar="$xbmkpwd/elf/libarchive/bsdtar" bsdtar="$xbmkpwd/elf/libarchive/bsdtar"
bsdunzip="$xbmkpwd/elf/libarchive/bsdunzip"
vendir="vendorfiles" vendir="vendorfiles"
appdir="$vendir/app" appdir="$vendir/app"
vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_" vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_"
@@ -299,7 +300,7 @@ extract_archive()
: :
elif "$bsdtar" -C "$2" -xf "$1"; then elif "$bsdtar" -C "$2" -xf "$1"; then
: :
elif unzip "$1" -d "$2"; then elif "$bsdunzip" "$1" -d "$2"; then
: :
else else
return 1 return 1
@@ -443,7 +444,7 @@ bootstrap()
x_ ./mk -b bios_extract x_ ./mk -b bios_extract
x_ ./mk -b biosutilities x_ ./mk -b biosutilities
x_ ./mk -b uefitool x_ ./mk -b uefitool
x_ ./mk -b libarchive # for bsdtar x_ ./mk -b libarchive # for bsdtar and bsdunzip
if [ -d "${kbc1126_ec_dump%/*}" ]; then if [ -d "${kbc1126_ec_dump%/*}" ]; then
x_ make -C "$cbdir/util/kbc1126" x_ make -C "$cbdir/util/kbc1126"