Remove /mnt/partner_partition

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 90 matching lines @@
 DEFINE_integer verity_error_behavior 3 \
   "Kernel verified boot error behavior (0: I/O errors, 1: panic, 2: nothing, \
 3: cros) Default: 3"
 DEFINE_integer verity_depth 1 \
   "Kernel verified boot hash tree depth. Default: 1"
 DEFINE_integer verity_max_ios -1 \
   "Number of outstanding I/O operations dm-verity caps at. Default: -1"
 DEFINE_string verity_algorithm "sha1" \
   "Cryptographic hash algorithm used for kernel vboot. Default : sha1"
 
-DEFINE_string oem_customization "" \
-  "Path to directory containing OEM partner partition contents"
-
 # Parse command line.
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # 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."
@@ skipping 118 matching lines @@
 BOARD="${FLAGS_board}"
 BOARD_ROOT="${FLAGS_build_root}/${BOARD}"
 
 ROOT_FS_IMG="${OUTPUT_DIR}/rootfs.image"
 ROOT_FS_DIR="${OUTPUT_DIR}/rootfs"
 ROOT_FS_HASH="${OUTPUT_DIR}/rootfs.hash"
 
 STATEFUL_FS_IMG="${OUTPUT_DIR}/stateful_partition.image"
 STATEFUL_FS_DIR="${OUTPUT_DIR}/stateful_partition"
 
-OEM_FS_IMG="${OUTPUT_DIR}/partner_partition.image"
-OEM_FS_DIR="${OUTPUT_DIR}/partner_partition"
-
 ESP_FS_IMG=${OUTPUT_DIR}/esp.image
 ESP_FS_DIR=${OUTPUT_DIR}/esp
 
 DEVKEYSDIR="/usr/share/vboot/devkeys"
 
 LOOP_DEV=
 STATEFUL_LOOP_DEV=
-OEM_LOOP_DEV=
 ESP_LOOP_DEV=
 
 # ${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"}
@@ skipping 49 matching lines @@
 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"
   sudo umount -d "${STATEFUL_FS_DIR}"
 }
 
-cleanup_oem_fs_loop() {
-  sudo umount -d "${OEM_FS_DIR}"
-}
-
-
 cleanup_esp_loop() {
   sudo umount -d "${ESP_FS_DIR}"
 }
 
 cleanup() {
   # Disable die on error.
   set +e
 
   if [[ -n "${STATEFUL_LOOP_DEV}" ]]; then
     cleanup_stateful_fs_loop
     STATEFUL_LOOP_DEV=
   fi
 
-  if [[ -n "${OEM_LOOP_DEV}" ]]; then
-    cleanup_oem_fs_loop
-  fi
-
   if [[ -n "${LOOP_DEV}" ]]; then
     cleanup_rootfs_loop
     LOOP_DEV=
   fi
 
   if [[ -n "${ESP_LOOP_DEV}" ]]; then
     cleanup_esp_loop
     ESP_LOOP_DEV=
   fi
 
@@ skipping 242 matching lines @@
       seek=$((STATEFUL_SIZE_BYTES - 1))
 
   # Tune and mount the stateful partition.
   UUID=$(uuidgen)
   DISK_LABEL="C-STATE"
   sudo losetup "${STATEFUL_LOOP_DEV}" "${STATEFUL_FS_IMG}"
   sudo mkfs.ext3 "${STATEFUL_LOOP_DEV}"
   sudo tune2fs -L "${DISK_LABEL}" -U "${UUID}" -c 0 -i 0 "${STATEFUL_LOOP_DEV}"
   sudo mount "${STATEFUL_LOOP_DEV}" "${STATEFUL_FS_DIR}"
 
-  # Create OEM partner partition.
-  OEM_LOOP_DEV=$(sudo losetup -f)
-  if [ -z "${OEM_LOOP_DEV}" ] ; then
-    echo "No free loop device.  Free up a loop device or reboot.  exiting. "
-    exit 1
-  fi
-  OEM_SIZE_BYTES=$((1024 * 1024 * 16))
-  dd if=/dev/zero of="${OEM_FS_IMG}" bs=1 count=1 seek=$((OEM_SIZE_BYTES - 1))
-
-  # Tune and mount OEM partner partition.
-  UUID=$(uuidgen)
-  DISK_LABEL="C-OEM"
-  sudo losetup "${OEM_LOOP_DEV}" "${OEM_FS_IMG}"
-  sudo mkfs.ext3 "${OEM_LOOP_DEV}"
-  sudo tune2fs -L "${DISK_LABEL}" -U "${UUID}" -c 0 -i 0 "${OEM_LOOP_DEV}"
-  sudo mount "${OEM_LOOP_DEV}" "${OEM_FS_DIR}"
-
-  # Populate OEM partner partition.
-  if [ ! -z "${FLAGS_oem_customization}" ]; then
-    if [ ! -d ${FLAGS_oem_customization} ]; then
-      echo "Specified OEM content directory does not exist.  exiting."
-      exit 1
-    fi
-    for ITEM in `ls -A ${FLAGS_oem_customization}`
-      do sudo cp -a "${FLAGS_oem_customization}/$ITEM" "${OEM_FS_DIR}"
-    done
-    sudo find "${OEM_FS_DIR}" -type d -exec chmod 755 "{}" \;
-    sudo find "${OEM_FS_DIR}" -type f -exec chmod 644 "{}" \;
-    sudo chown -R root:root "${OEM_FS_DIR}"
-  else
-    echo "Empty OEM partition: OEM customizations will not be applied."
-  fi
-
   # -- Install packages into the root file system --
 
   # We need to install libc manually from the cross toolchain.
   # TODO: Improve this? We only want libc and not the whole toolchain.
   PKGDIR="/var/lib/portage/pkgs/cross/"
   sudo tar jxvpf \
     "${PKGDIR}/${CHOST}/cross-${CHOST}"/glibc-${LIBC_VERSION}.tbz2 \
     -C "${ROOT_FS_DIR}" --strip-components=3 \
     --exclude=usr/include --exclude=sys-include --exclude=*.a --exclude=*.o
 
@@ skipping 101 matching lines @@
   local largs="-o ${OUTPUT_DIR}"
   test ! -d "${OUTPUT_DIR}" && mkdir -p "${OUTPUT_DIR}"
   info "Running ${lgenerateauzip} ${largs} for generating AU updater zip file"
   $lgenerateauzip $largs
 }
 
 # Create the output directory.
 mkdir -p "${OUTPUT_DIR}"
 mkdir -p "${ROOT_FS_DIR}"
 mkdir -p "${STATEFUL_FS_DIR}"
-mkdir -p "${OEM_FS_DIR}"
 mkdir -p "${ESP_FS_DIR}"
 
 # Preserve old images by copying them forward for --preserve.
 if [[ $FLAGS_preserve -eq ${FLAGS_TRUE} ]] ; then
   if [[ -f ${PREVIOUS_DIR}/${PRISTINE_IMAGE_NAME} ]] ; then
     # Copy forward pristine image, and associated files
     cp ${PREVIOUS_DIR}/*.sh ${PREVIOUS_DIR}/config.txt ${OUTPUT_DIR}
     cp ${PREVIOUS_DIR}/${PRISTINE_IMAGE_NAME} ${OUTPUT_DIR}
 
     # Copy forward the developer image, if we already copied forward the base.
@@ skipping 57 matching lines @@
   fi
 
   update_dev_packages ${DEVELOPER_IMAGE_NAME}
   ${SCRIPTS_DIR}/bin/cros_make_image_bootable "${OUTPUT_DIR}" \
                                               "${DEVELOPER_IMAGE_NAME}" \
                                               ${crosbug12352_flag}
 fi
 
 # Clean up temporary files.
 rm -f "${ROOT_FS_IMG}" "${STATEFUL_FS_IMG}" "${OUTPUT_DIR}/vmlinuz.image" \
-  "${ESP_FS_IMG}" "${OEM_FS_IMG}" "${OUTPUT_DIR}/vmlinuz_hd.vblock"
-rmdir "${ROOT_FS_DIR}" "${STATEFUL_FS_DIR}" "${OEM_FS_DIR}" "${ESP_FS_DIR}"
+  "${ESP_FS_IMG}" "${OUTPUT_DIR}/vmlinuz_hd.vblock"
+rmdir "${ROOT_FS_DIR}" "${STATEFUL_FS_DIR}" "${ESP_FS_DIR}"
 
 # Generating AU generator zip file to run outside chroot
 generate_au_zip || echo "Failed generating AU zip file - ignoring Error..."
 # Create a 'latest' link
 rm -f ${FLAGS_output_root}/${FLAGS_board}/latest
 ln -s $(basename ${OUTPUT_DIR}) ${FLAGS_output_root}/${FLAGS_board}/latest
 
 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
 
 print_time_elapsed
 
 echo "To copy to USB keyfob, 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."