Added empty ext3 filesystem initialization for OEM 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 94 matching lines @@
 
 BOARD="${FLAGS_board}"
 BOARD_ROOT="${FLAGS_build_root}/${BOARD}"
 
 ROOT_FS_IMG="${OUTPUT_DIR}/rootfs.image"
 ROOT_FS_DIR="${OUTPUT_DIR}/rootfs"
 
 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
 
 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 48 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
   fi
 
+  if [[ -n "${OEM_LOOP_DEV}" ]]; then
+    cleanup_oem_fs_loop
+  fi
+
   if [[ -n "${LOOP_DEV}" ]]; then
     cleanup_rootfs_loop
   fi
 
   if [[ -n "${ESP_LOOP_DEV}" ]]; then
     cleanup_esp_loop
   fi
 
   # Turn die on error back on.
   set -e
@@ skipping 133 matching lines @@
   sudo tune2fs -L "${DISK_LABEL}" -U "${UUID}" -c 0 -i 0 "${LOOP_DEV}"
   sudo mount "${LOOP_DEV}" "${ROOT_FS_DIR}"
 
   # Create stateful partition of the same size as the rootfs.
   STATEFUL_LOOP_DEV=$(sudo losetup -f)
   if [ -z "${STATEFUL_LOOP_DEV}" ] ; then
     echo "No free loop device.  Free up a loop device or reboot.  exiting. "
     exit 1
   fi
   dd if=/dev/zero of="${STATEFUL_FS_IMG}" bs=1 count=1 seek=$((ROOT_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 "C-STATE" -U "${UUID}" -c 0 -i 0 \
-      "${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}"
 
-  # Mount the stateful partition.
-  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}"
 
   # Turn root file system into bootable image.
   if [[ "${ARCH}" = "x86" ]]; then
     # Setup extlinux configuration.
     # TODO: For some reason the /dev/disk/by-uuid is not being generated by udev
     # in the initramfs. When we figure that out, switch to root=UUID=${UUID}.
     sudo mkdir -p "${ROOT_FS_DIR}"/boot
     # TODO(adlr): use initramfs for booting.
     cat <<EOF | sudo dd of="${ROOT_FS_DIR}"/boot/extlinux.conf
 DEFAULT chromeos-usb
@@ skipping 197 matching lines @@
     --rootfs_partition_size=${FLAGS_rootfs_partition_size} \
     ${RECOVERY} \
     "${OUTPUT_DIR}" \
     "${OUTPUT_IMG}"
 }
 
 # 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}"
 
 create_base_image ${OUTPUT_DIR}/${PRISTINE_IMAGE_NAME}
 
 # Create a recovery image based on the chromium os base image.
 if [ "${FLAGS_recovery}" -eq "${FLAGS_TRUE}" ] ; then
   update_recovery_packages ${OUTPUT_DIR}/${PRISTINE_IMAGE_NAME}
 fi
 trap - EXIT
 
 
 # Create a developer image based on the chromium os base image.
 if [ "${FLAGS_withdev}" -eq "${FLAGS_TRUE}" ] ; then
   echo "Creating developer image from base image ${OUTPUT_IMG}"
   cp ${OUTPUT_DIR}/${PRISTINE_IMAGE_NAME} ${OUTPUT_DIR}/${DEVELOPER_IMAGE_NAME}
   update_dev_packages ${OUTPUT_DIR}/${DEVELOPER_IMAGE_NAME}
 fi
 
 trap - EXIT
 
 # FIXME: only signing things for x86 right now.
 if [[ "${ARCH}" = "x86" ]]; then
   # Verify the final image.
   load_kernel_test "${OUTPUT_IMG}" "${OUTPUT_DIR}/key_alg8.vbpubk"
 fi
 
 # Clean up temporary files.
 rm -f "${ROOT_FS_IMG}" "${STATEFUL_FS_IMG}" "${OUTPUT_DIR}/vmlinuz.image" \
   "${ESP_FS_IMG}" "${OUTPUT_DIR}/data4_sign8.keyblock" \
-  "${OUTPUT_DIR}/key_alg4.vbpubk" "${OUTPUT_DIR}/key_alg8.vbpubk"
-rmdir "${ROOT_FS_DIR}" "${STATEFUL_FS_DIR}" "${ESP_FS_DIR}"
+  "${OUTPUT_DIR}/key_alg4.vbpubk" "${OUTPUT_DIR}/key_alg8.vbpubk" \
+  "${OEM_FS_IMG}"
+rmdir "${ROOT_FS_DIR}" "${STATEFUL_FS_DIR}" "${OEM_FS_DIR}" "${ESP_FS_DIR}"
 
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "Chromium OS image created as ${PRISTINE_IMAGE_NAME}"
 if [ "${FLAGS_recovery}" -eq "${FLAGS_TRUE}" ]; then
   echo "Recovery image created as ${PRISTINE_IMAGE_NAME}"
 fi
 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, 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."