Added command line parameter to specify OEM content location.

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 56 matching lines @@
 DEFINE_integer vboot_behavior 2 \
   "Verified boot error behavior (0: I/O errors, 1: reboot, 2: nothing) \
 Default: 2"
 DEFINE_integer vboot_depth 1 \
   "Verified boot hash tree depth. Default: 1"
 DEFINE_integer vboot_max_ios 1024 \
   "Number of outstanding I/O operations dm-verity caps at. Default: 1024"
 DEFINE_string vboot_algorithm "sha1" \
   "Cryptographic hash algorithm used for vboot. Default : sha1"
 
+DEFINE_string oem_customization \
+  "$GCLIENT_ROOT/src/platform/assets/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 436 matching lines @@
   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 [ -n ${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}"
+  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 151 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_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."