diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2019-04-30 07:18:00 +0800 |
|---|---|---|
| committer | Hung-Te Lin <hungte@chromium.org> | 2019-04-29 23:51:13 +0000 |
| commit | d74a79cb08a6028060fe7a3046882fc9b9cf51c1 (patch) | |
| tree | 120e5db9103473102989a30c9a5ea0765eb0ff13 | |
| parent | c19d237aba8a147f8521d67fa0aa54542d9250e5 (diff) | |
| download | vboot-factory-strago-7458.B.tar.gz | |
futility: updater: Fix build failurefactory-strago-7458.B
The hack to FTS need to reorder where fts.h is included.
Also add libzip to tests.
BUG=None
TEST=make futil; tests/futility/run_test_scripts.sh $(pwd)/build/futility
BRANCH=None
Change-Id: I63628f519d087220b0c445c16f33c5d0e14030a0
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1588021
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | futility/updater_archive.c | 1 |
2 files changed, 3 insertions, 4 deletions
@@ -1141,7 +1141,7 @@ ${TEST_BINS}: LIBS = ${TESTLIB} ${UTILLIB} ${TEST_FUTIL_BINS}: ${FUTIL_OBJS} ${UTILLIB} ${UTILLIB21} ${TEST_FUTIL_BINS}: INCLUDES += -Ifutility ${TEST_FUTIL_BINS}: OBJS += ${FUTIL_OBJS} ${UTILLIB} ${UTILLIB21} -${TEST_FUTIL_BINS}: LDLIBS += ${CRYPTO_LIBS} +${TEST_FUTIL_BINS}: LDLIBS += ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${TEST2X_BINS}: ${FWLIB2X} ${TEST2X_BINS}: LIBS += ${FWLIB2X} @@ -1218,8 +1218,8 @@ ${BUILD}/utility/signature_digest_utility: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/host/linktest/main: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/tests/vboot_common2_tests: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/tests/vboot_common3_tests: LDLIBS += ${CRYPTO_LIBS} -${BUILD}/tests/vb20_common2_tests: LDLIBS += ${CRYPTO_LIBS} -${BUILD}/tests/vb20_common3_tests: LDLIBS += ${CRYPTO_LIBS} +${BUILD}/tests/vb20_common2_tests: LDLIBS += ${CRYPTO_LIBS} ${LIBZIP_LIBS} +${BUILD}/tests/vb20_common3_tests: LDLIBS += ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${BUILD}/tests/verify_kernel: LDLIBS += ${CRYPTO_LIBS} ${TEST21_BINS}: LDLIBS += ${CRYPTO_LIBS} diff --git a/futility/updater_archive.c b/futility/updater_archive.c index 6d112506..a70cbeab 100644 --- a/futility/updater_archive.c +++ b/futility/updater_archive.c @@ -8,7 +8,6 @@ #include <assert.h> #include <ctype.h> -#include <fts.h> #include <string.h> #include <stdio.h> #include <stdlib.h> |