From 6d414d275e6cbd587fd1e36d8bbdf29c24beb28c Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 8 Dec 2013 16:00:50 -0800
Subject: [PATCH] fix(*): remove lingering broken support for board overlays.

This is a feature from the chromeos sdk that we haven't used and doesn't
work any more. Clean it up...
---
 bash_completion                   | 20 --------------------
 build_image                       |  7 -------
 build_library/disk_layout_util.sh |  6 ------
 common.sh                         | 12 ------------
 setup_board                       |  2 --
 5 files changed, 47 deletions(-)

diff --git a/bash_completion b/bash_completion
index d6cc2fbedf..be99b65e68 100644
--- a/bash_completion
+++ b/bash_completion
@@ -81,25 +81,6 @@ _board_sysroot() {
   _complete_board_sysroot_flag && return 0
 }
 
-# echo the existing target board overlays
-_board_overlays() {
-  local overlaydir=../overlays
-  if [ -d ${overlaydir} ]; then
-    echo $(command ls $overlaydir | grep overlay- | sed s,overlay-,,)
-  fi
-}
-
-# Completion for --board= argument for existing board overlays
-_board_overlay() {
-  _flag_complete && return 0
-
-  COMPREPLY=()
-  local arg=$(_argeq --board)
-  if [[ ${arg} == --board=* ]]; then
-    COMPREPLY=( $(compgen -W "$(_board_overlays)" -- ${arg#--board=}) )
-  fi
-}
-
 # Completion for -c and -s argument for autotest script
 _ls_autotest() {
   local autotest_dir=../third_party/autotest/files
@@ -252,7 +233,6 @@ complete -o bashdefault -o default -F _board_sysroot \
   build_packages \
   image_to_usb.sh \
   mod_image_for_test.sh
-complete -o bashdefault -o default -F _board_overlay setup_board
 complete -o bashdefault -o default -o nospace -F _autotest_complete autotest
 complete -F _cros_workon cros_workon
 complete -F _complete_repo repo
diff --git a/build_image b/build_image
index 76ddc32f4f..e28fa96635 100755
--- a/build_image
+++ b/build_image
@@ -84,13 +84,6 @@ check_gsutil_opts
 
 parse_build_image_args
 
-for overlay in $(cros_list_overlays --board "$BOARD"); do
-  setup_sh="${overlay}/scripts/board_specific_setup.sh"
-  if [[ -e ${setup_sh} ]]; then
-    source "${setup_sh}"
-  fi
-done
-
 BASE_PACKAGE="coreos-base/coreos"
 
 PRISTINE_IMAGE_NAME=${CHROMEOS_BASE_IMAGE_NAME}
diff --git a/build_library/disk_layout_util.sh b/build_library/disk_layout_util.sh
index e337111e70..dbbd1a0704 100644
--- a/build_library/disk_layout_util.sh
+++ b/build_library/disk_layout_util.sh
@@ -19,12 +19,6 @@ cgpt_py() {
 
 get_disk_layout_path() {
   DISK_LAYOUT_PATH="${BUILD_LIBRARY_DIR}/legacy_disk_layout.json"
-  for overlay in $(cros_list_overlays --board "$BOARD"); do
-    local disk_layout="${overlay}/scripts/disk_layout.json"
-    if [[ -e ${disk_layout} ]]; then
-      DISK_LAYOUT_PATH=${disk_layout}
-    fi
-  done
 }
 
 write_partition_table() {
diff --git a/common.sh b/common.sh
index 069d4ed013..6e638e175c 100644
--- a/common.sh
+++ b/common.sh
@@ -373,14 +373,6 @@ DEFAULT_CHROOT_DIR=${CHROMEOS_CHROOT_DIR:-"${GCLIENT_ROOT}/chroot"}
 # they don't pollute the source directory.
 DEFAULT_BUILD_ROOT=${CHROMEOS_BUILD_ROOT:-"${SRC_ROOT}/build"}
 
-# Set up a global ALL_BOARDS value
-if [[ -d ${SRC_ROOT}/overlays ]]; then
-  ALL_BOARDS=$(cd "${SRC_ROOT}/overlays"; \
-    ls -1d overlay-* 2>&- | sed 's,overlay-,,g')
-fi
-# Normalize whitespace.
-ALL_BOARDS=$(echo ${ALL_BOARDS})
-
 # Sets the default board variable for calling script.
 if [[ -f ${GCLIENT_ROOT}/src/scripts/.default_board ]]; then
   DEFAULT_BOARD=$(<"${GCLIENT_ROOT}/src/scripts/.default_board")
@@ -390,10 +382,6 @@ if [[ -f ${GCLIENT_ROOT}/src/scripts/.default_board ]]; then
         "'${DEFAULT_BOARD}'"
   fi
 fi
-# Stub to get people to upgrade.
-get_default_board() {
-  warn "please upgrade your script, and make sure to run build_packages"
-}
 
 # Enable --fast by default.
 DEFAULT_FAST=${FLAGS_TRUE}
diff --git a/setup_board b/setup_board
index b68517bafd..ff278bc58a 100755
--- a/setup_board
+++ b/setup_board
@@ -35,8 +35,6 @@ show_help_if_requested "$@"
 # not needed for the typical developer workflow.
 DEFINE_string accept_licenses "" \
   "Licenses to append to the accept list."
-DEFINE_string board_overlay "" \
-  "Location of the board overlay."
 DEFINE_boolean fast "${DEFAULT_FAST}" \
   "Use the parallel_emerge wrapper script."
 DEFINE_integer jobs "${NUM_JOBS}" \