diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2022-05-13 11:18:24 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-05-15 13:02:15 +0000 |
| commit | d2072ef664acf5486a664a8652e6d6f3dd9bf6fe (patch) | |
| tree | 2fb22ee4edbd457e9792f53944854ae1488db9e9 /Makefile | |
| parent | e399c71caa6f2b1fccc6dd6ee6e1f07dc7fc7aab (diff) | |
| download | vboot-d2072ef664acf5486a664a8652e6d6f3dd9bf6fe.tar.gz | |
futility: updater: support reading the archives using libarchive
The firmware archive files from buildbot are usually released in
tar+bzip2 format. Although the standard format of the archive
(chromeos-firmwareupdate) is ZIP, it is very helpful if the developers
can quickly run the update using the standard tar.bz2 archive files.
BUG=b:230679721
TEST=futility update --manifest -a \
~/Downloads/ChromeOS-firmware-R91-13885.3.0-asurada.tar.bz2
QEMU_LD_PREFIX=/build/cherry qemu-arm /build/cherry/usr/bin/futility \
update --manifest -a \
~/Downloads/ChromeOS-firmware-R91-13885.3.0-asurada.tar.bz2
BRANCH=None
Change-Id: Ibbab2e8226a00e8b5b292293af570eda37b31a8a
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3644540
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -275,6 +275,13 @@ ifneq ($(filter-out 0,${HAVE_LIBZIP}),) LIBZIP_LIBS := $(shell ${PKG_CONFIG} --libs libzip) endif +LIBARCHIVE_VERSION := $(shell ${PKG_CONFIG} --modversion libarchive 2>/dev/null) +HAVE_LIBARCHIVE := $(if ${LIBARCHIVE_VERSION},1) +ifneq ($(filter-out 0,${HAVE_LIBARCHIVE}),) + CFLAGS += -DHAVE_LIBARCHIVE $(shell ${PKG_CONFIG} --cflags libarchive) + LIBARCHIVE_LIBS := $(shell ${PKG_CONFIG} --libs libarchive) +endif + HAVE_CROSID := $(shell ${PKG_CONFIG} --exists crosid && echo 1) ifeq ($(HAVE_CROSID),1) CFLAGS += -DHAVE_CROSID $(shell ${PKG_CONFIG} --cflags crosid) @@ -1040,7 +1047,8 @@ signing_install: $(if ${SDK_BUILD},\ futil: ${FUTIL_BIN} # FUTIL_LIBS is shared by FUTIL_BIN and TEST_FUTIL_BINS. -FUTIL_LIBS = ${CROSID_LIBS} ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${FLASHROM_LIBS} +FUTIL_LIBS = ${CROSID_LIBS} ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${LIBARCHIVE_LIBS} \ + ${FLASHROM_LIBS} ${FUTIL_BIN}: LDLIBS += ${FUTIL_LIBS} ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB} |