From 4075c8be38c49f4b6de6366455bc1ced9826a54f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 28 Sep 2025 01:55:47 +0100 Subject: vendor.sh: use bsdtar, not unar unar is buggy and crap and bsdtar has superior licensing Signed-off-by: Leah Rowe --- include/vendor.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') 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" -- cgit v1.2.1