commit 474ae60d8af48536d4097c57a49f56254cf8f6ba
author Mike Frysinger <vapier@chromium.org> Thu Jul 19 14:03:00 2018 -0400
committer chrome-bot <chrome-bot@chromium.org> Fri Jul 20 05:31:30 2018 -0700
tree 1d0f92def72313c7e2e18130d7b9e361fc7f9e74
parent 75d465cd7c81500cbff400aa392508a2076dfc30

drop --brick usage

We dropped the code from chromite, so scrub it here too.

BUG=chromium:530677
TEST=precq passes

Change-Id: I4b1f849c6e1060fb3b33e6021b6a1b39b11daada
Reviewed-on: https://chromium-review.googlesource.com/1144120
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>

common.sh

diff --git a/common.sh b/common.sh
index feea2ab..3ac26c7 100644
--- a/common.sh
+++ b/common.sh
@@ -1041,14 +1041,6 @@
 get_board_and_variant() {
   local flags_board=$1
   local flags_variant=$2
-  local flags_brick=$3
-
-  if [[ -n "${flags_brick}" ]]; then
-    BOARD="$(cros_brick_utils --friendly-name ${flags_brick})"
-    BOARD_VARIANT="${BOARD}"
-    VARIANT=""
-    return
-  fi
 
   BOARD=$(echo "${flags_board}" | cut -d '_' -f 1)
   VARIANT=${flags_variant:-$(echo "${flags_board}" | cut -s -d '_' -f 2)}

setup_board

diff --git a/setup_board b/setup_board
index b410c87..4c578f1 100755
--- a/setup_board
+++ b/setup_board
@@ -62,7 +62,6 @@
   "Don't emerge any packages during setup_board into the board root."
 DEFINE_string board_root "" \
   "Board root."
-DEFINE_string brick "" "Brick to set up."
 DEFINE_string save_install_plan "" \
   "Save install plan to filename for correct reverse dependency calculation."
 
@@ -82,15 +81,11 @@
 # so will die prematurely if 'switch_to_strict_mode' is specified before now.
 switch_to_strict_mode
 
-if [[ -z "${FLAGS_board}" ]] && [[ -z "${FLAGS_brick}" ]]; then
-  die "--board or --brick required."
-elif [[ -n "${FLAGS_brick}" ]]; then
-  # Clear the board value if brick was provided (backward compatibility).
-  [[ -z "${FLAGS_board}" ]] || warn "--brick was used, ignoring --board value"
-  FLAGS_board=
+if [[ -z "${FLAGS_board}" ]]; then
+  die "--board required."
 fi
 
-get_board_and_variant "${FLAGS_board}" "${FLAGS_variant}" "${FLAGS_brick}"
+get_board_and_variant "${FLAGS_board}" "${FLAGS_variant}"
 
 # Before we can run any tools, we need to update chroot
 UPDATE_ARGS="--toolchain_boards=${BOARD}"
@@ -102,8 +97,7 @@
 if [[ "${FLAGS_jobs}" -ne -1 ]]; then
   UPDATE_ARGS+=" --jobs=${FLAGS_jobs}"
 fi
-if [[ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_TRUE}" ]] \
-  || [[ -n "${FLAGS_brick}" ]]; then
+if [[ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_TRUE}" ]]; then
   UPDATE_ARGS+=" --skip_toolchain_update"
 fi
 if [[ ! -z "${FLAGS_save_install_plan}" ]]; then
@@ -190,13 +184,8 @@
 
 # Generating the standard configuration file (make.conf.board_setup) for the
 # sysroot.
-if [[ -n "${FLAGS_brick}" ]]; then
-  cros_sysroot_utils generate-config --sysroot="${BOARD_ROOT}" \
-    --brick="${FLAGS_brick}" --out-file="${BOARD_SETUP}"
-else
-  cros_sysroot_utils generate-config --sysroot="${BOARD_ROOT}" \
-    --board="${FLAGS_board}" --out-file="${BOARD_SETUP}"
-fi
+cros_sysroot_utils generate-config --sysroot="${BOARD_ROOT}" \
+  --board="${FLAGS_board}" --out-file="${BOARD_SETUP}"
 
 # Generate wrappers for portage helpers (equery, portageq, emerge, etc...).
 # Those are used to generate make.conf.board.