summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2014-09-05 12:52:27 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-09-12 03:39:40 +0000
commita1d9fe6eecf82540d31d34bba988e4838d295302 (patch)
tree94bc87f0c92ca76f85fcfcbd8a709bb6d776b778 /Makefile
parenta19b00dfd0c17681b71bd61994854dff3f3576a3 (diff)
downloadvboot-a1d9fe6eecf82540d31d34bba988e4838d295302.tar.gz
futility: stop using the symlink names in utility scripts
We still create the symlinks (FOO -> futility), but this change invokes those built-in functions with "futility FOO ..." instead of using the FOO symlink. Note that the scripts/ directory is unchanged. That's a separate CL, since we don't have tests for that. BUG=chromium:231547 BRANCH=ToT TEST=make runtests In addition to running "make runtests", I temporarily modified the Makefile to avoid creating the symlinks at all. The tests still passed. Change-Id: I96863259b9df02a3611f759a7509bf4090ae03e8 Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/216717 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f8572db5..371ba8b1 100644
--- a/Makefile
+++ b/Makefile
@@ -520,7 +520,7 @@ FUTIL_STATIC_BIN = ${FUTIL_BIN}_s
# These are the executables that are now built in to futility. We'll create
# symlinks for these so the old names will still work.
# TODO: Do we still need dev_sign_file for anything?
-FUTIL_BUILTIN = \
+FUTIL_SYMLINKS = \
dev_sign_file \
dump_fmap \
dump_kernel_config \
@@ -901,7 +901,7 @@ futil_install: ${FUTIL_BIN}
@$(PRINTF) " INSTALL futility\n"
${Q}mkdir -p ${UB_DIR}
${Q}${INSTALL} -t ${UB_DIR} ${FUTIL_BIN} ${FUTIL_STATIC_BIN}
- ${Q}for prog in ${FUTIL_BUILTIN}; do \
+ ${Q}for prog in ${FUTIL_SYMLINKS}; do \
ln -sf futility "${UB_DIR}/$$prog"; done
# ----------------------------------------------------------------------------