diff options
| author | Mike Frysinger <vapier@chromium.org> | 2017-10-09 22:41:05 -0400 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-10-10 05:31:03 -0700 |
| commit | 5d5b2f16109662dceb55dfbe62772ee41887be82 (patch) | |
| tree | f119693c5c6f897454c312453ace68e80fedc761 | |
| parent | 95554e4e62dc2ae8333a6487f973f830753de071 (diff) | |
| download | vboot-5d5b2f16109662dceb55dfbe62772ee41887be82.tar.gz | |
futility_s: add vbutil_firmware & vbutil_key
The firmware updater relies on these, so include them.
BUG=chromium:772862
TEST=build works and futility_s includes new commands
BRANCH=None
Change-Id: I973e339d11df4d5b72f70d3a9e28916cca4ebbf6
Reviewed-on: https://chromium-review.googlesource.com/708236
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -665,6 +665,8 @@ FUTIL_STATIC_SRCS = \ futility/futility.c \ futility/cmd_dump_fmap.c \ futility/cmd_gbb_utility.c \ + futility/cmd_vbutil_firmware.c \ + futility/cmd_vbutil_key.c \ futility/misc.c \ futility/ryu_root_header.c @@ -1125,6 +1127,7 @@ signing_install: ${SIGNING_SCRIPTS} ${SIGNING_SCRIPTS_DEV} ${SIGNING_COMMON} .PHONY: futil futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN} +${FUTIL_STATIC_BIN}: LDLIBS += ${CRYPTO_STATIC_LIBS} ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} @@ -1244,6 +1247,7 @@ ${UTIL_DEFAULTS}: # Some utilities need external crypto functions CRYPTO_LIBS := $(shell ${PKG_CONFIG} --libs libcrypto) +CRYPTO_STATIC_LIBS := $(shell ${PKG_CONFIG} --libs libcrypto --static) ${BUILD}/utility/dumpRSAPublicKey: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/utility/pad_digest_utility: LDLIBS += ${CRYPTO_LIBS} |