From e9e2d66366d280e8af525ff59ee335d37356b9a1 Mon Sep 17 00:00:00 2001
From: Chris Sosa <sosa@chromium.org>
Date: Fri, 9 Mar 2012 15:27:48 -0800
Subject: [PATCH] Remove --nofast --nostatefuldev from build_image as they are
 never used.

BUG=chromium-os:27362
TEST=Built a test image.

Change-Id: I884acd534f06d9070b28d5cd74862e2774822578
Reviewed-on: https://gerrit.chromium.org/gerrit/17759
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Chris Sosa <sosa@chromium.org>
---
 build_image                      |  4 ----
 build_library/dev_image_util.sh  | 13 +++++--------
 build_library/test_image_util.sh |  9 +++------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/build_image b/build_image
index ce3f6755cf..d25e438227 100755
--- a/build_image
+++ b/build_image
@@ -25,8 +25,6 @@ DEFINE_boolean replace ${FLAGS_FALSE} \
   "Overwrite existing output, if any."
 DEFINE_integer jobs -1 \
   "How many packages to build in parallel at maximum."
-DEFINE_boolean statefuldev ${FLAGS_TRUE} \
-  "Install development packages on stateful partition rather than the rootfs"
 DEFINE_integer rootfs_partition_size 1024 \
   "rootfs partition size in MiBs."
 DEFINE_integer rootfs_size 850 \
@@ -36,8 +34,6 @@ DEFINE_integer rootfs_hash_pad 8 \
   "MiBs reserved at the end of the rootfs image."
 DEFINE_integer statefulfs_size 1024 \
   "stateful filesystem size in MiBs."
-DEFINE_boolean fast ${DEFAULT_FAST} \
-  "Call many emerges in parallel"
 DEFINE_string boot_args "noinitrd" \
   "Additional boot arguments to pass to the commandline"
 
diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh
index 4f8fa39bdc..5fcf087f22 100755
--- a/build_library/dev_image_util.sh
+++ b/build_library/dev_image_util.sh
@@ -20,9 +20,7 @@ install_dev_packages() {
     "${STATEFUL_FS_DIR}" "${ESP_FS_DIR}"
 
   # Determine the root dir for developer packages.
-  local root_dev_dir="${ROOT_FS_DIR}"
-  [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ] &&
-    root_dev_dir="${ROOT_FS_DIR}/usr/local"
+  local root_dev_dir="${ROOT_FS_DIR}/usr/local"
 
   # Install developer packages described in chromeos-dev.
   emerge_to_image --root="${root_dev_dir}" chromeos-dev
@@ -34,11 +32,10 @@ install_dev_packages() {
   ./usr/lib/debug/usr/${CHOST} --strip-components=6
 
   # Install the bare necessary files so that the "emerge" command works
-  if [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ]; then
-    sudo cp -a ${root_dev_dir}/share/portage ${ROOT_FS_DIR}/usr/share
-    sudo sed -i s,/usr/bin/wget,wget, \
-      ${ROOT_FS_DIR}/usr/share/portage/config/make.globals
-  fi
+  sudo cp -a ${root_dev_dir}/share/portage ${ROOT_FS_DIR}/usr/share
+  sudo sed -i s,/usr/bin/wget,wget, \
+    ${ROOT_FS_DIR}/usr/share/portage/config/make.globals
+
   sudo mkdir -p ${ROOT_FS_DIR}/etc/make.profile
 
   # Re-run ldconfig to fix /etc/ldconfig.so.cache.
diff --git a/build_library/test_image_util.sh b/build_library/test_image_util.sh
index e6d2abbb12..9a7caabbee 100755
--- a/build_library/test_image_util.sh
+++ b/build_library/test_image_util.sh
@@ -17,12 +17,9 @@
 # build_image and mod_image_for_test.sh.  The code is not used
 # by the mod_image_for_test function.
 
-EMERGE_BOARD_CMD="emerge-$BOARD"
-if [ $FLAGS_fast -eq $FLAGS_TRUE ]; then
-  echo "Using alternate emerge"
-  EMERGE_BOARD_CMD="$GCLIENT_ROOT/chromite/bin/parallel_emerge"
-  EMERGE_BOARD_CMD="$EMERGE_BOARD_CMD --board=$BOARD"
-fi
+EMERGE_BOARD_CMD="$GCLIENT_ROOT/chromite/bin/parallel_emerge"
+EMERGE_BOARD_CMD="$EMERGE_BOARD_CMD --board=$BOARD"
+
 if [ $FLAGS_jobs -ne -1 ]; then
   EMERGE_JOBS="--jobs=$FLAGS_jobs"
 fi