summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2025-09-28 01:55:47 +0100
committerLeah Rowe <leah@libreboot.org>2025-09-28 01:56:05 +0100
commit4075c8be38c49f4b6de6366455bc1ced9826a54f (patch)
tree940916b6db64476f3b8b77d71081aa9ae08fd7ba
parente527820ceb71166b0bf80336d48799ff3bbf2868 (diff)
vendor.sh: use bsdtar, not unar
unar is buggy and crap and bsdtar has superior licensing Signed-off-by: Leah Rowe <leah@libreboot.org>
-rw-r--r--include/vendor.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/vendor.sh b/include/vendor.sh
index c44de2b1..14ef29d8 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -17,6 +17,7 @@ e6400_unpack="$xbmkpwd/src/bios_extract/dell_inspiron_1100_unpacker.py"
me7updateparser="$xbmkpwd/util/me7_update_parser/me7_update_parser.py"
pfs_extract="$xbmkpwd/src/biosutilities/Dell_PFS_Extract.py"
uefiextract="$xbmkpwd/elf/uefitool/uefiextract"
+bsdtar="$xbmkpwd/elf/libarchive/bsdtar"
vendir="vendorfiles"
appdir="$vendir/app"
vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_"
@@ -296,7 +297,7 @@ extract_archive()
:
elif 7z x "$1" -o"$2"; then
:
- elif unar -f "$1" -o "$2"; then
+ elif "$bsdtar" -C "$2" -xf "$1"; then
:
elif unzip "$1" -d "$2"; then
:
@@ -442,6 +443,7 @@ bootstrap()
x_ ./mk -b bios_extract
x_ ./mk -b biosutilities
x_ ./mk -b uefitool
+ x_ ./mk -b libarchive # for bsdtar
if [ -d "${kbc1126_ec_dump%/*}" ]; then
x_ make -C "$cbdir/util/kbc1126"