Condense dev and factory install shim options

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 77 matching lines @@
 
 # Only now can we die on error.  shflags functions leak non-zero error codes,
 # so will die prematurely if 'set -e' is specified before now.
 set -e
 
 if [ -z "${FLAGS_board}" ] ; then
   error "--board is required."
   exit 1
 fi
 
-if [ "$((FLAGS_rootfs_size + FLAGS_rootfs_hash_pad))" -gt \
-     "${FLAGS_rootfs_partition_size}" ] ; then
-  error "rootfs ($((FLAGS_rootfs_size + FLAGS_rootfs_hash_pad)) MiB) is \
-bigger than partition (${FLAGS_rootfs_partition_size} MiB)."
-  exit 1
-fi
-
 # Verify user didn't specify incompatible flags for dev install shim
 if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] &&
    [ ${FLAGS_dev_install} -eq ${FLAGS_TRUE} ] ; then
   error "Incompatible flags: --factory_install and --dev_install cannot be \
 both set to True. Please specify one or none."
   exit 1
 fi
 
-# Disable --withdev flag when --dev_install is set to True. Otherwise, the
-# dev image produced will be based on dev install shim, rather than a pristine
-# image
-if [ ${FLAGS_withdev} -eq ${FLAGS_TRUE} ] &&
+INSTALL_MASK=""
+if [ ${FLAGS_installmask} -eq ${FLAGS_TRUE} ] ; then
+  INSTALL_MASK="${DEFAULT_INSTALL_MASK}"
+fi
+
+# Reduce the size of factory install shim.
+if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] ||
    [ ${FLAGS_dev_install} -eq ${FLAGS_TRUE} ] ; then
-  info "Incompatible flags: --withdev and --dev_install cannot be both set to \
-True. Reset --withdev to False."
-  FLAGS_withdev=${FLAGS_FALSE}
+  # Disable --withdev flag when --*_install is set to True. Otherwise, the
+  # dev image produced will be based on install shim, rather than a pristine
+  # image
+  if [ ${FLAGS_withdev} -eq ${FLAGS_TRUE} ]; then
+    info "Incompatible flags: --withdev and --dev_install or --factory_install \
+cannot be both set to True. Reset --withdev to False."
+    FLAGS_withdev=${FLAGS_FALSE}
+  fi
+
+  # TODO: Build a separated ebuild for the install shim to reduce size.
+  INSTALL_MASK="${INSTALL_MASK} ${FACTORY_INSTALL_MASK}"
+
+  info "Fixing the rootfs size at 300 MiB for install shim"
+  FLAGS_rootfs_size=280
+  FLAGS_rootfs_partition_size=300
+  info "Fixing the statefulfs size at 140 MiB for install shim"
+  FLAGS_statefulfs_size=140
+fi
+
+if [ "$((FLAGS_rootfs_size + FLAGS_rootfs_hash_pad))" -gt \
+     "${FLAGS_rootfs_partition_size}" ] ; then
+  die "rootfs ($((FLAGS_rootfs_size + FLAGS_rootfs_hash_pad)) MiB) is \
+bigger than partition (${FLAGS_rootfs_partition_size} MiB)."
 fi
 
 EMERGE_BOARD_CMD="emerge-${FLAGS_board}"
 if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
   echo "Using alternate emerge"
   EMERGE_BOARD_CMD="${SCRIPTS_DIR}/parallel_emerge --board=${FLAGS_board}"
 fi
 
 # Determine build version.
 . "${SCRIPTS_DIR}/chromeos_version.sh"
 
 # Use canonical path since some tools (e.g. mount) do not like symlinks.
 # Append build attempt to output directory.
 IMAGE_SUBDIR="${CHROMEOS_VERSION_STRING}-a${FLAGS_build_attempt}"
 OUTPUT_DIR="${FLAGS_output_root}/${FLAGS_board}/${IMAGE_SUBDIR}"
 
 OUTSIDE_OUTPUT_DIR="../build/images/${FLAGS_board}/${IMAGE_SUBDIR}"
 
 # If we are creating a developer image, also create a pristine image with a
 # different name.
 DEVELOPER_IMAGE_NAME=
 PRISTINE_IMAGE_NAME=chromiumos_image.bin
 if [ "${FLAGS_withdev}" -eq "${FLAGS_TRUE}" ]; then
   PRISTINE_IMAGE_NAME=chromiumos_base_image.bin
   DEVELOPER_IMAGE_NAME=chromiumos_image.bin
-fi
-
-# Rename pristine image for dev install shim
-if [ "${FLAGS_dev_install}" -eq "${FLAGS_TRUE}" ]; then
+elif [ "${FLAGS_dev_install}" -eq "${FLAGS_TRUE}" ]; then
+# Rename pristine images for install shims
   PRISTINE_IMAGE_NAME=dev_install_shim.bin
+elif [ "${FLAGS_factory_install}" -eq "${FLAGS_TRUE}" ]; then
+  PRISTINE_IMAGE_NAME=factory_install_shim.bin
 fi
 
 PRISTINE_IMG="${OUTPUT_DIR}/${PRISTINE_IMAGE_NAME}"
 DEVELOPER_IMG="${OUTPUT_DIR}/${DEVELOPER_IMAGE_NAME}"
 
 BOARD="${FLAGS_board}"
 BOARD_ROOT="${FLAGS_build_root}/${BOARD}"
 
 ROOT_FS_IMG="${OUTPUT_DIR}/rootfs.image"
 ROOT_FS_DIR="${OUTPUT_DIR}/rootfs"
@@ skipping 17 matching lines @@
 
 # ${DEV_IMAGE_ROOT} specifies the location of where developer packages will
 # be installed on the stateful dir.  On a Chromium OS system, this will
 # translate to /usr/local.
 DEV_IMAGE_ROOT="${STATEFUL_FS_DIR}/dev_image"
 
 # What cross-build are we targeting?
 . "${BOARD_ROOT}/etc/make.conf.board_setup"
 LIBC_VERSION=${LIBC_VERSION:-"2.10.1-r1"}
 
-INSTALL_MASK=""
-if [[ ${FLAGS_installmask} -eq ${FLAGS_TRUE} ]] ; then
-  INSTALL_MASK="${DEFAULT_INSTALL_MASK}"
-fi
-
-# Reduce the size of factory install shim.
-# TODO: Build a separated ebuild for the factory install shim to reduce size.
-if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] ||
-   [ ${FLAGS_dev_install} -eq ${FLAGS_TRUE} ] ; then
-  INSTALL_MASK="${INSTALL_MASK} ${FACTORY_INSTALL_MASK}"
-fi
-
-if [[ ${FLAGS_jobs} -ne -1 ]]; then
+if [ ${FLAGS_jobs} -ne -1 ]; then
   EMERGE_JOBS="--jobs=${FLAGS_jobs}"
 fi
 
 # Figure out ARCH from the given toolchain.
 # TODO: Move to common.sh as a function after scripts are switched over.
 TC_ARCH=$(echo "${CHOST}" | awk -F'-' '{ print $1 }')
 case "${TC_ARCH}" in
   arm*)
     ARCH="arm"
     ;;
@@ skipping 437 matching lines @@
     cp ${PREVIOUS_DIR}/${PRISTINE_IMAGE_NAME} ${OUTPUT_DIR}
 
     # Copy forward the developer image, if we already copied forward the base.
     if [[ ${FLAGS_withdev} -eq ${FLAGS_TRUE} ]] && \
        [[ -f ${PREVIOUS_DIR}/${DEVELOPER_IMAGE_NAME} ]] ; then
       cp ${PREVIOUS_DIR}/${DEVELOPER_IMAGE_NAME} ${OUTPUT_DIR}
     fi
   fi
 fi
 
-# Minimize rootfs size for factory installer
-if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]; then
-  info "Fixing the rootfs size at 300 MiB for the factory installer"
-  FLAGS_rootfs_size=300
-fi
-
-# Minimize rootfs size and statefulfs size for dev install shim
-if [ ${FLAGS_dev_install} -eq ${FLAGS_TRUE} ] ; then
-  info "Fixing the rootfs size at 300 MiB for dev install shim"
-  FLAGS_rootfs_size=300
-  info "Fixing the statefulfs size at 140 MiB for dev install shim"
-  FLAGS_statefulfs_size=140
-fi
-
 # Create the boot.desc file which stores the build-time configuration
 # information needed for making the image bootable after creation with
 # cros_make_image_bootable.
 create_boot_desc
 
 if [[ -f ${PRISTINE_IMG} ]] ; then
   update_base_packages ${PRISTINE_IMAGE_NAME}
 else
   create_base_image ${PRISTINE_IMAGE_NAME}
 fi
 
 USE_DEV_KEYS=
-if [ "${FLAGS_dev_install}" -eq "${FLAGS_TRUE}" ]; then
+if [ "${FLAGS_dev_install}" -eq "${FLAGS_TRUE}" ] || \
+   [ "${FLAGS_factory_install}" -eq "${FLAGS_TRUE}" ]; then
   USE_DEV_KEYS="--use_dev_keys"
 fi
 
 # Place flags before positional args
 ${SCRIPTS_DIR}/bin/cros_make_image_bootable "${OUTPUT_DIR}" \
                                             "${PRISTINE_IMAGE_NAME}" \
                                             ${USE_DEV_KEYS}
 
 # FIXME: only signing things for x86 right now.
 if [[ "${ARCH}" = "x86" ]]; then
   BOOT_FLAG=
-  if [ "${FLAGS_dev_install}" -eq "${FLAGS_TRUE}" ] ; then
+  if [ "${FLAGS_dev_install}" -eq "${FLAGS_TRUE}" ] ||
+     [ "${FLAGS_factory_install}" -eq "${FLAGS_TRUE}" ]; then
     BOOT_FLAG="-b 1"  # BOOT_FLAG_DEVELOPER value defined in load_kernel_fw.h
     info "--dev_install set, pass BOOT_FLAG_DEVELOPER flag to load_kernel_test"
   fi
 
   # Verify the final image.
   load_kernel_test "${OUTPUT_DIR}/${PRISTINE_IMAGE_NAME}" \
     "${DEVKEYSDIR}/recovery_key.vbpubk" ${BOOT_FLAG}
 fi
 
 # Create a developer image based on the chromium os base image.
@@ skipping 23 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, INSIDE the chroot, do something like:"
 echo "  ./image_to_vm.sh --from=${OUTSIDE_OUTPUT_DIR} --board=${BOARD}"
 echo "from the scripts directory where you entered the chroot."