summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2014-10-01 14:10:45 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-10-22 20:03:05 +0000
commit20a7ef17e7af1f51c62f4d64c1fa73ab6c0ac0cf (patch)
treef7e751dfc9264e025e2b48cd47620bd97b73dd65 /Makefile
parent52a15f96ac009222ebf7d1299c7d17825e5a4ab5 (diff)
downloadvboot-release-R39-6310.B.tar.gz
futility: rolled back vbutil_kernel changestabilize-6310.69.Brelease-R39-6310.B
When disabling verity with make_dev_ssh.sh, a bug in vbutil_kernel caused the re-signed kernel size to be the entire kernel partition instead of just the necessary bits. Until we can improve the test coverage, I'm rolling back the changes that introduced this bug. BUG=chromium:418647 BRANCH=ToT TEST=manual Created a new test image with these changes. You can install it and disable dm-verity and it works (although there seems to be an unrelated browser startup issue on ToT). Original-Change-Id: I48e8427b05e191c9894c42056429a79d57bfc78d Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/220935 Reviewed-by: Randall Spangler <rspangler@chromium.org> (cherry picked from commit f1dba02034fba650c84cec52630755cd3c063e88) Change-Id: Id008ce5d467c87949885de960e8dabb8d8461e7f Reviewed-on: https://chromium-review.googlesource.com/224983 Commit-Queue: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b26e2ab3..d5f00885 100644
--- a/Makefile
+++ b/Makefile
@@ -545,6 +545,7 @@ FUTIL_SRCS = \
futility/cmd_sign.c \
futility/cmd_vbutil_firmware.c \
futility/cmd_vbutil_kernel.c \
+ futility/cmd_vbutil_kernel0.c \
futility/cmd_vbutil_key.c \
futility/cmd_vbutil_keyblock.c \
futility/cmd_verify_kernel.c \