summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorDon Garrett <dgarrett@google.com>2015-10-09 12:58:19 -0700
committerchrome-bot <chrome-bot@chromium.org>2015-10-13 05:28:44 -0700
commitc0c7400713f66a79f15a65f98aa347e7b2cc89d7 (patch)
treef7130adb9ff429bd54389f356e84fbe71b6a4e3a /cli
parent0080700e6a952f5c32d0f6ffa89219bbb3cab015 (diff)
downloadchromite-c0c7400713f66a79f15a65f98aa347e7b2cc89d7.tar.gz
brick_lib: Remove this library.
This library partially implemented the Chrome OS Brillo concept of a brick. That concept is no longer relevant, so remove the library. Update assorted users, removing the concept of brick where it seems appropriate. BUG=chromium:530677 TEST=run_tests Change-Id: I3d768ffd8c16b559cca1eb1e459be20d8e912492 Reviewed-on: https://chromium-review.googlesource.com/305024 Commit-Ready: Don Garrett <dgarrett@chromium.org> Tested-by: Don Garrett <dgarrett@chromium.org> Reviewed-by: Don Garrett <dgarrett@chromium.org>
Diffstat (limited to 'cli')
-rw-r--r--cli/command.py3
-rw-r--r--cli/cros/cros_build.py9
2 files changed, 0 insertions, 12 deletions
diff --git a/cli/command.py b/cli/command.py
index 360a6ec10..7743ae2cb 100644
--- a/cli/command.py
+++ b/cli/command.py
@@ -19,7 +19,6 @@ import glob
import os
from chromite.cbuildbot import constants
-from chromite.lib import brick_lib
from chromite.lib import commandline
from chromite.lib import cros_build_lib
from chromite.lib import cros_import
@@ -158,8 +157,6 @@ class CliCommand(object):
def __init__(self, options):
self.options = options
- brick = brick_lib.FindBrickInPath()
- self.curr_brick_locator = brick.brick_locator if brick else None
@classmethod
def AddParser(cls, parser):
diff --git a/cli/cros/cros_build.py b/cli/cros/cros_build.py
index badfb69f4..0709288f5 100644
--- a/cli/cros/cros_build.py
+++ b/cli/cros/cros_build.py
@@ -7,7 +7,6 @@
from __future__ import print_function
from chromite.cli import command
-from chromite.lib import brick_lib
from chromite.lib import chroot_util
from chromite.lib import commandline
from chromite.lib import cros_build_lib
@@ -54,12 +53,6 @@ To just build a single package:
self.host = True
elif self.options.board:
self.board = self.options.board
- elif self.options.brick or self.curr_brick_locator:
- self.brick = brick_lib.Brick(self.options.brick
- or self.curr_brick_locator)
- self.board = self.brick.FriendlyName()
- if not self.build_pkgs:
- self.build_pkgs = self.brick.MainPackages()
else:
# If nothing is explicitly set, use the default board.
self.board = cros_build_lib.GetDefaultBoard()
@@ -72,8 +65,6 @@ To just build a single package:
super(cls, BuildCommand).AddParser(parser)
target = parser.add_mutually_exclusive_group()
target.add_argument('--board', help='The board to build packages for.')
- target.add_argument('--brick', type='brick_path',
- help='The brick to build packages for.')
target.add_argument('--host', help='Build packages for the chroot itself.',
default=False, action='store_true')
parser.add_argument('--no-binary', help="Don't use binary packages.",