Make build_image create a bootable kernel partition.

src/scripts/build_image

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to build a bootable keyfob-based chromeos system image from within
 # a chromiumos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
@@ skipping 105 matching lines @@
   if [[ $FLAGS_replace -eq $FLAGS_TRUE ]]; then
     sudo rm -rf "$OUTPUT_DIR"
   else
     echo "Directory $OUTPUT_DIR already exists."
     echo "Use --build_attempt option to specify an unused attempt."
     echo "Or use --replace if you want to overwrite this directory."
     exit 1
   fi
 fi
 
+# Be verbose to help debug failures.
+set -x
+
 # Create the output directory.
 mkdir -p "$OUTPUT_DIR"
 
 cleanup_rootfs_loop() {
   sudo umount -d "$ROOT_FS_DIR"
 }
 
 cleanup_stateful_fs_loop() {
   sudo umount "${ROOT_FS_DIR}/usr/local"
   sudo umount "${ROOT_FS_DIR}/var"
@@ skipping 244 matching lines @@
 sudo mount --bind "${STATEFUL_DIR}/var" "${ROOT_FS_DIR}/var"
 
 # We "emerge --root=$ROOT_FS_DIR --root-deps=rdeps --usepkgonly" all of the
 # runtime packages for chrome os. This builds up a chrome os image from binary
 # packages with runtime dependencies only.  We use INSTALL_MASK to trim the
 # image size as much as possible.
 sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
   --root="$ROOT_FS_DIR" --root-deps=rdeps \
   --usepkgonly chromeos $EMERGE_JOBS
 
-# Extract the kernel from the root filesystem for use by the GPT image. Legacy
-# BIOS will use the kernel in the rootfs (via syslinux), Chrome OS BIOS will
-# use the kernel partition.
-sudo cp -f "${ROOT_FS_DIR}/boot/vmlinuz" "${OUTPUT_DIR}/vmlinuz.image"
-
 # Create EFI System Partition to boot stock EFI BIOS (but not ChromeOS EFI
 # BIOS). We only need this for x86, but it's simpler and safer to keep the disk
 # images the same for both x86 and ARM.
 ESP_IMG=${OUTPUT_DIR}/esp.image
 # NOTE: The size argument for mkfs.vfat is in 1024-byte blocks. We'll hard-code
 # it to 16M for now.
 ESP_BLOCKS=16384
 /usr/sbin/mkfs.vfat -C ${OUTPUT_DIR}/esp.image ${ESP_BLOCKS}
 ESP_DIR=${OUTPUT_DIR}/esp
 ESP_LOOP_DEV=$(sudo losetup -f)
@@ skipping 16 matching lines @@
 menuentry "local image A" {
   linux $grubpartA/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/$linuxpartA ro noresume noswap i915.modeset=1 loglevel=1
 }
 
 menuentry "local image B" {
   linux $grubpartB/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/$linuxpartB ro noresume noswap i915.modeset=1 loglevel=1
 }
 
 EOF
 
+# Legacy BIOS will use the kernel in the rootfs (via syslinux), as will
+# standard EFI BIOS (via grub, from the EFI System Partition). Chrome OS BIOS
+# will use a separate signed kernel partition, which we'll create now.
+# FIXME: remove serial output, debugging messages
+cat <<'EOF' > "${OUTPUT_DIR}/config.txt"
+earlyprintk=serial,ttyS0,115200
+console=ttyS0,115200
+init=/sbin/init
+add_efi_memmap
+boot=local
+rootwait
+root=/dev/sd%D%P
+ro
+noresume
+noswap
+i915.modeset=1
+loglevel=7
+Hi_Mom
+EOF
+
+# FIXME: We need to specify the real keys and certs here!
+SIG_DIR="${SRC_ROOT}/platform/vboot_reference/tests/testkeys"
+
+# Create the kernel partition image.
+kernel_utility --generate \
+    --firmware_key "${SIG_DIR}/key_rsa4096.pem" \
+    --kernel_key "${SIG_DIR}/key_rsa1024.pem" \
+    --kernel_key_pub "${SIG_DIR}/key_rsa1024.keyb" \
+    --firmware_sign_algorithm 8 \
+    --kernel_sign_algorithm 2 \
+    --kernel_key_version 1 \
+    --kernel_version 1 \
+    --config "${OUTPUT_DIR}/config.txt" \
+    --bootloader /lib64/bootstub/bootstub.efi \
+    --vmlinuz "${ROOT_FS_DIR}/boot/vmlinuz" \
+    --out "${OUTPUT_DIR}/vmlinuz.image"
+
 # Perform any customizations on the root file system that are needed.
 "${SCRIPTS_DIR}/customize_rootfs" \
   --root="$ROOT_FS_DIR" \
   --target="$ARCH" \
   --board="$BOARD"
 
 # Don't test the factory install shim.
 if [[ $FLAGS_factory_install -eq ${FLAGS_FALSE} ]] ; then
   # Check that the image has been correctly created.
   "${SCRIPTS_DIR}/test_image" \
@@ skipping 29 matching lines @@
 rm -f "${ROOT_FS_IMG}" "${STATEFUL_IMG}" "${OUTPUT_DIR}/vmlinuz.image" \
   "${ESP_IMG}"
 rmdir "${ROOT_FS_DIR}" "${STATEFUL_DIR}" "${ESP_DIR}"
 
 OUTSIDE_OUTPUT_DIR="../build/images/${FLAGS_board}/${IMAGE_SUBDIR}"
 
 # Create a developer image based on the chromium os base image
 [ "$FLAGS_withdev" -eq "$FLAGS_TRUE" ] && create_developer_image
 trap - EXIT
 
+# be quiet again
+set +x
+
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "Chromium OS image created as $PRISTINE_IMAGE_NAME"
 if [ "$FLAGS_withdev" -eq "$FLAGS_TRUE" ]; then
   echo "Developer image created as $DEVELOPER_IMAGE_NAME"
 fi
 echo "To copy to USB keyfob, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdX"
 echo "To convert to VMWare image, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."