unify vboot path vars
A bunch of scripts duplicate vboot paths, so unify them all in common.sh.
BUG=chromium:660209
TEST=precq passes
Change-Id: I7e568a205a0ab93ed6a413a88f9bb79c06095883
Reviewed-on: https://chromium-review.googlesource.com/427498
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>
diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable
index fffec2c..bdbc539 100755
--- a/bin/cros_make_image_bootable
+++ b/bin/cros_make_image_bootable
@@ -109,7 +109,7 @@
DEFINE_string verity_salt "" \
"Salt for rootfs hash tree."
-DEFINE_string keys_dir "/usr/share/vboot/devkeys" \
+DEFINE_string keys_dir "${VBOOT_DEVKEYS_DIR}" \
"Directory containing the signing keys."
DEFINE_string rootfs_mountpoint "/tmp/rootfs" \
diff --git a/build_image b/build_image
index 369592c..20074ca 100755
--- a/build_image
+++ b/build_image
@@ -164,8 +164,6 @@
PRISTINE_IMAGE_NAME=${CHROMEOS_BASE_IMAGE_NAME}
fi
-DEVKEYSDIR="/usr/share/vboot/devkeys"
-
if [[ ${FLAGS_eclean} -eq ${FLAGS_TRUE} ]]; then
"${BOARD_ROOT}/build/bin/eclean" -d packages
fi
diff --git a/build_kernel_image.sh b/build_kernel_image.sh
index 5b52039..f1f2a16 100755
--- a/build_kernel_image.sh
+++ b/build_kernel_image.sh
@@ -24,7 +24,7 @@
"Working directory for in-progress files. (Default: /tmp/vmlinuz.working)"
DEFINE_boolean keep_work ${FLAGS_FALSE} \
"Keep temporary files (*.keyblock, *.vbpubk). (Default: false)"
-DEFINE_string keys_dir "${SRC_ROOT}/platform/vboot_reference/tests/testkeys" \
+DEFINE_string keys_dir "${VBOOT_TESTKEYS_DIR}" \
"Directory with the RSA signing keys. (Defaults to test keys)"
DEFINE_string keyblock "kernel.keyblock" \
"The keyblock to use. (Defaults to kernel.keyblock)"
diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index df21d11..b4f710f 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -133,7 +133,7 @@
--board=${BOARD}
--image_type=${image_type}
--arch="${ARCH}"
- --keys_dir="${DEVKEYSDIR}"
+ --keys_dir="${VBOOT_DEVKEYS_DIR}"
--boot_args="${FLAGS_boot_args}"
--nocleanup_dirs
--verity_algorithm=sha1
diff --git a/common.sh b/common.sh
index a86dd38..54f4a20 100644
--- a/common.sh
+++ b/common.sh
@@ -409,6 +409,12 @@
# Directory to store built images. Should be set by sourcing script when used.
BUILD_DIR=
+# Path to the verified boot directory where we get signing related keys/scripts.
+VBOOT_DIR="${CHROOT_TRUNK_DIR}/src/platform/vboot_reference"
+VBOOT_TESTKEYS_DIR="${VBOOT_DIR}/tests/testkeys"
+VBOOT_DEVKEYS_DIR="${VBOOT_DIR}/tests/devkeys"
+VBOOT_SIGNING_DIR="${VBOOT_DIR}/scripts/image_signing"
+
# Standard filenames
CHROMEOS_BASE_IMAGE_NAME="chromiumos_base_image.bin"
CHROMEOS_IMAGE_NAME="chromiumos_image.bin"
diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh
index aa035b6..c556c91 100755
--- a/mod_image_for_recovery.sh
+++ b/mod_image_for_recovery.sh
@@ -42,7 +42,7 @@
j
DEFINE_string build_root "/build" \
"root location for board sysroots"
-DEFINE_string keys_dir "/usr/share/vboot/devkeys" \
+DEFINE_string keys_dir "${VBOOT_DEVKEYS_DIR}" \
"directory containing the signing keys"
DEFINE_boolean verbose $FLAGS_FALSE \
"log all commands to stdout" v
diff --git a/mod_test_image_for_dbusspy.sh b/mod_test_image_for_dbusspy.sh
index 8ec6b77..bcee415 100755
--- a/mod_test_image_for_dbusspy.sh
+++ b/mod_test_image_for_dbusspy.sh
@@ -33,9 +33,6 @@
ROOT_FS_DIR="${IMAGE_DIR}/rootfs"
DBUS_CONF="$(dirname "$0")/mod_for_dbusspy/dbus.conf"
SYSTEM_LOCAL_CONF="$(dirname "$0")/mod_for_dbusspy/system-local.conf"
-DEVKEYS_DIR="/usr/share/vboot/devkeys"
-VBOOT_DIR="${CHROOT_TRUNK_DIR}/src/platform/vboot_reference/scripts/"\
-"image_signing"
cleanup() {
"${SCRIPTS_DIR}/mount_gpt_image.sh" -u -r "$ROOT_FS_DIR"
@@ -67,7 +64,6 @@
# cros_make_image_bootable.
cleanup
TMP_BIN_PATH="${FLAGS_image}.new"
-"${VBOOT_DIR}/sign_official_build.sh" usb "${FLAGS_image}" \
- "${DEVKEYS_DIR}" \
- "${TMP_BIN_PATH}"
+"${VBOOT_SIGNING_DIR}/sign_official_build.sh" \
+ usb "${FLAGS_image}" "${VBOOT_DEVKEYS_DIR}" "${TMP_BIN_PATH}"
mv "${TMP_BIN_PATH}" "${FLAGS_image}"
diff --git a/mod_test_image_for_pyauto.sh b/mod_test_image_for_pyauto.sh
index d3f517e..cab8b64 100644
--- a/mod_test_image_for_pyauto.sh
+++ b/mod_test_image_for_pyauto.sh
@@ -41,8 +41,6 @@
PYAUTO_DEP="${FLAGS_build_root}/client/deps/pyauto_dep"
CHROME_DEP="${FLAGS_build_root}/client/deps/chrome_test"
-VBOOT_DIR="${CHROOT_TRUNK_DIR}/src/platform/vboot_reference/scripts/"\
-"image_signing"
if [ ! -d $PYAUTO_DEP ]; then
die_notrace "The required path: $PYAUTO_DEP does not exist. Did you mean \
@@ -54,10 +52,10 @@
to pass --build_root and the path to the autotest bundle?"
fi
-if [ ! -d $VBOOT_DIR ]; then
- die_notrace "The required path: $VBOOT_DIR does not exist. This directory \
-needs to be sync'd into your chroot.\n $ cros_workon start vboot_reference \
---board ${FLAGS_board}"
+if [[ ! -d "${VBOOT_SIGNING_DIR}" ]]; then
+ die_notrace "The required path: $VBOOT_SIGNING_DIR does not exist. This \
+directory needs to be sync'd into your chroot.\n $ cros_workon start \
+vboot_reference --board ${FLAGS_board}"
fi
if [ ! -d "${FLAGS_build_root}/client/cros" ]; then
@@ -173,16 +171,14 @@
cleanup
# cros_make_image_bootable is unstable (crosbug.com/18709)
-DEVKEYS_DIR="${CHROOT_TRUNK_DIR}/src/platform/vboot_reference/tests/devkeys/"
TMP_BIN_PATH="$(dirname "${FLAGS_image}")/pyauto_tmp.bin"
echo ${TMP_BIN_PATH}
rm -f "${TMP_BIN_PATH}"
-"${VBOOT_DIR}/sign_official_build.sh" usb "${FLAGS_image}" \
- "${DEVKEYS_DIR}" \
- "${TMP_BIN_PATH}" \
+"${VBOOT_SIGNING_DIR}/sign_official_build.sh" \
+ usb "${FLAGS_image}" "${VBOOT_DEVKEYS_DIR}" "${TMP_BIN_PATH}"
rm -f "${FLAGS_image}"
mv "${TMP_BIN_PATH}" "${FLAGS_image}"
