Remove USE_UBUNTU_KERNEL stuff.

Review URL: http://chromereview.prom.corp.google.com/1188039


git-svn-id: svn://chrome-svn/chromeos/trunk@235 06c00378-0e64-4dae-be16-12b19f9950a1

build_image.sh

@@ -29,8 +29,6 @@ DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/images"      \
   "Directory in which to place image result directories (named by version)"
 DEFINE_string build_root "$DEFAULT_BUILD_ROOT"                \
   "Root of build output"
-DEFINE_boolean use_ubuntu_kernel $FLAGS_FALSE                 \
-  "Use the Ubuntu kernel (rather than our own)?"
 DEFINE_boolean replace $FLAGS_FALSE "Overwrite existing output, if any."
 DEFINE_boolean increment $FLAGS_FALSE \
   "Picks the latest build and increments the minor version by one."
@@ -56,12 +54,6 @@ eval set -- "${FLAGS_ARGV}"
 # Die on any errors.
 set -e
 
-USE_UBUNTU_KERNEL=0
-if [ $FLAGS_use_ubuntu_kernel -eq $FLAGS_TRUE ]
-then
-  USE_UBUNTU_KERNEL=1
-fi
-
 # Determine build version
 . "${SCRIPTS_DIR}/chromeos_version.sh"
 
@@ -143,7 +135,7 @@ mkdir -p "$ROOT_FS_DIR"
 
 # Create root file system disk image to fit on a 1GB memory stick.
 # 1 GB in hard-drive-manufacturer-speak is 10^9, not 2^30.  950MB < 10^9 bytes.
-ROOT_SIZE_BYTES=$((1024 * 1024 * 950)) 
+ROOT_SIZE_BYTES=$((1024 * 1024 * 950))
 dd if=/dev/zero of="$ROOT_FS_IMG" bs=1 count=1 seek=$((ROOT_SIZE_BYTES - 1))
 
 # Format, tune, and mount the rootfs.
@@ -211,7 +203,6 @@ MIRROR2_INSIDE="${FLAGS_mirror2/$GCLIENT_ROOT//trunk}"
 CUST_OPTS="${SETUP_DIR}/customize_opts.sh"
 cat <<EOF > $CUST_OPTS
 SETUP_DIR="$ROOTFS_SETUP_DIR"
-USE_UBUNTU_KERNEL="$USE_UBUNTU_KERNEL"
 KERNEL_VERSION="$KERNEL_VERSION"
 SERVER="$MIRROR_INSIDE"
 SUITE="$FLAGS_suite"

customize_rootfs.sh

@@ -108,18 +108,6 @@ EOF
 apt-get --yes --force-yes --no-install-recommends \
   install "linux-image-${KERNEL_VERSION}"
 
-# Create custom initramfs
-# TODO: Remove when we switch to dhendrix kernel for good.
-if [ $USE_UBUNTU_KERNEL -eq 1 ]
-then
-cat <<EOF >> /etc/initramfs-tools/modules
-intel_agp
-drm
-i915 modeset=1
-EOF
-update-initramfs -u
-fi
-
 # Set timezone symlink
 rm -f /etc/localtime
 ln -s /mnt/stateful_partition/etc/localtime /etc/localtime