From 3ec878636b48c50f5d6e74ae03b23be080da2169 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Fri, 23 Dec 2016 18:19:22 +0100 Subject: cros-scripts: cros-kernel-prepare update with more definitions Signed-off-by: Paul Kocialkowski --- projects/cros-scripts/install/cros-kernel-prepare | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'projects/cros-scripts') diff --git a/projects/cros-scripts/install/cros-kernel-prepare b/projects/cros-scripts/install/cros-kernel-prepare index 9a50b0df..00f90234 100755 --- a/projects/cros-scripts/install/cros-kernel-prepare +++ b/projects/cros-scripts/install/cros-kernel-prepare @@ -15,6 +15,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +KEYBLOCK="keyblock" +VBPRIVK="vbprivk" +VBPUBK="vbpubk" ARCH="arch" CMDLINE="cmdline" BOOTLOADER="bootloader" @@ -53,7 +56,7 @@ pack() { local kernel_image_path="$kernel_files_path/$KERNEL_IMAGE" mkimage -f "$kernel_its_path" "$kernel_fit_path" - futility vbutil_kernel --pack "$kernel_image_path" --version 1 --arch "$arch" --keyblock "$VBOOT_KEYS_PATH/kernel.keyblock" --signprivate "$VBOOT_KEYS_PATH/kernel_data_key.vbprivk" --config "$cmdline_path" --vmlinuz "$kernel_fit_path" --bootloader "$bootloader_path" + futility vbutil_kernel --pack "$kernel_image_path" --version 1 --arch "$arch" --keyblock "$VBOOT_KEYS_PATH/kernel.$KEYBLOCK" --signprivate "$VBOOT_KEYS_PATH/kernel_data_key.$VBPRIVK" --config "$cmdline_path" --vmlinuz "$kernel_fit_path" --bootloader "$bootloader_path" printf "\nPacked kernel image $kernel_image_path\n" } @@ -61,7 +64,7 @@ pack() { sign() { local kernel_image_path=$1 - futility vbutil_kernel --repack "$kernel_image_path" --version 1 --keyblock "$VBOOT_KEYS_PATH/kernel.keyblock" --signprivate "$VBOOT_KEYS_PATH/kernel_data_key.vbprivk" --oldblob "$kernel_image_path" + futility vbutil_kernel --repack "$kernel_image_path" --version 1 --keyblock "$VBOOT_KEYS_PATH/kernel.$KEYBLOCK" --signprivate "$VBOOT_KEYS_PATH/kernel_data_key.$VBPRIVK" --oldblob "$kernel_image_path" printf "\nSigned kernel image $kernel_image_path\n" } @@ -69,7 +72,7 @@ sign() { verify() { local kernel_image_path=$1 - futility vbutil_kernel --verify "$kernel_image_path" --signpubkey "$VBOOT_KEYS_PATH/kernel_subkey.vbpubk" + futility vbutil_kernel --verify "$kernel_image_path" --signpubkey "$VBOOT_KEYS_PATH/kernel_subkey.$VBPUBK" printf "\nVerified kernel image $kernel_image_path\n" } -- cgit v1.2.3-70-g09d2