build_image,update_bootloaders: directly update the built image

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 273 matching lines @@
     cros_root=/dev/mmcblk1p3
   fi
   if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then
     cros_root=/dev/dm-0
   fi
 
   # TODO(wad) mount the root fs to LOOP_DEV from the image
   trap "mount_gpt_cleanup" EXIT
   ${SCRIPTS_DIR}/mount_gpt_image.sh --from "${OUTPUT_DIR}" \
     --image "${image_name}" -r "${ROOT_FS_DIR}" \
-    -s "${STATEFUL_FS_DIR}" -e "${ESP_FS_DIR}"
+    -s "${STATEFUL_FS_DIR}"
 
   sudo mount -o remount,ro "${ROOT_FS_DIR}"
   root_dev=$(mount | grep -- "${ROOT_FS_DIR}" | cut -f1 -d' ' | tail -1)
 
   DEVKEYSDIR="/usr/share/vboot/devkeys"
 
   # Builds the kernel partition image.  The temporary files are kept around
   # so that we can perform a load_kernel_test later on the final image.
   ${SCRIPTS_DIR}/build_kernel_image.sh \
     --arch="${ARCH}" \
@@ skipping 20 matching lines @@
     sudo cp "${OUTPUT_DIR}/vmlinuz_hd.vblock" "${STATEFUL_FS_DIR}"
   fi
 
   # START_KERN_A is set by the first call to install the gpt.
   local koffset="$(partoffset ${OUTPUT_DIR}/${image_name} 2)"
   sudo dd if="${OUTPUT_DIR}/vmlinuz.image" of="${OUTPUT_DIR}/${image_name}" \
     conv=notrunc bs=512 seek=${koffset}
 
   # Update the bootloaders.  For legacy/efi x86, the EFI system partition
   # will be updated and for arm, the mbr will be updated (for u-boot).
-  local kernel_part="--kernel_partition='${OUTPUT_DIR}/vmlinuz.image'"
-  kernel_part="${kernel_part} --install_syslinux"
-  local bootloader_to="${ESP_FS_IMG}"
+  local kernel_part=
+  local bootloader_to=
+  local bootloader_to_flags=
   local usb_disk="${FLAGS_usb_disk}"
-  local bootloader_to="$(mount | grep ${ESP_FS_DIR} | cut -f1 -d' ')"
-  if [[ "${ARCH}" == "arm" ]]; then
+
+  if [[ "${ARCH}" = "x86" ]]; then
+    # x86 should update the esp in place in the image.
+    bootloader_to="${OUTPUT_DIR}/${image_name}"
+    local esp_offset="$(partoffset ${OUTPUT_DIR}/${image_name} 12)"
+    esp_offset=$((esp_offset * 512))  # sectors to bytes
+    local esp_size="$(partsize ${OUTPUT_DIR}/${image_name} 12)"
+    esp_size=$((esp_size * 512))  # sectors to bytes
+    bootloader_to_flags="--to_offset=${esp_offset} --to_size=${esp_size}"
+    # Use the kernel partition to acquire configuration flags.
+    kernel_part="--kernel_partition='${OUTPUT_DIR}/vmlinuz.image'"
+    # Install syslinux on the EFI System Partition.
+    kernel_part="${kernel_part} --install_syslinux"
+  elif [[ "${ARCH}" = "arm" ]]; then
     # TODO(wad) mmcblk1p3 is hardcoded for arm for now!
     usb_disk="/dev/mmcblk1p3"
+    # ARM doesn't support using the kernel image for kernel cmdline flags yet.
     kernel_part="--kernel_cmdline=\"${FLAGS_arm_extra_bootargs}\" "
     # TODO(wad) Integrate dmtable extraction into the arm build
     # E.g.  $(cat ${OUTPUT_DIR}/boot.config | tr -s '\n' ' ')"
     local kpart_offset="--kernel_partition_offset=${koffset}"
     local kpart_size="--kernel_partition_sectors="
     kpart_size="${kpart_size}$(partsize ${OUTPUT_DIR}/${image_name} 2)"
     kernel_part="${kernel_part} ${kpart_size} ${kpart_offset}"
     info "Using addition bootloader arguments: ${kernel_part}"
     bootloader_to="${OUTPUT_DIR}/arm.mbr"
   fi
 
-  # Temporary hack to fix syslinux building:
-  sudo umount ${ESP_FS_DIR}
-
   # Update partition 12 / legacy bootloaders and arm.
   ${SCRIPTS_DIR}/update_bootloaders.sh \
     --arch=${ARCH} \
     --to="${bootloader_to}" \
     --from="${OUTPUT_DIR}"/boot \
     --vmlinuz="${OUTPUT_DIR}"/boot/vmlinuz \
     --usb_disk="${usb_disk}" \
+    ${bootloader_to_flags} \
     $kernel_part
 
   if [[ "${ARCH}" == "arm" ]]; then
     sudo dd bs=1 conv=notrunc  if="${bootloader_to}" \
       of="${OUTPUT_DIR}/${image_name}"
     sudo rm "${bootloader_to}"
   fi
 
   trap - EXIT
-  # Temporary hack to fix syslinux building, comment out -e ${ESP_FS_DIR}
-  # ${SCRIPTS_DIR}/mount_gpt_image.sh -u -r "${ROOT_FS_DIR}" \
-  #   -s "${STATEFUL_FS_DIR}" -e "${ESP_FS_DIR}"
   ${SCRIPTS_DIR}/mount_gpt_image.sh -u -r "${ROOT_FS_DIR}" \
     -s "${STATEFUL_FS_DIR}"
 }
 
 # Modifies an existing image to add development packages
 update_dev_packages() {
   local image_name=$1
 
   echo "Adding developer packages to ${image_name}"
 
@@ skipping 337 matching lines @@
   echo "Developer image created as ${DEVELOPER_IMAGE_NAME}"
 fi
 
 print_time_elapsed
 
 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_vm.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."