Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: chromeos/scripts/setup_board

Issue 3571015: Added support for boards with only private overlays. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/chromiumos-overlay.git
Patch Set: Centralized board primary overlay logic in a call to cros_overlay_list Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/scripts/build_packages ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/scripts/setup_board
diff --git a/chromeos/scripts/setup_board b/chromeos/scripts/setup_board
index 9d01adcc7c7caa21967c8d615de8bd30f0e08aad..8f7954ecf7e2914b602e3ba05937e82ef867d738 100755
--- a/chromeos/scripts/setup_board
+++ b/chromeos/scripts/setup_board
@@ -112,33 +112,15 @@ done
# Check if there are any board overlays. There should be at least a top
# level board specific overlay.
#
-PRIMARY_BOARD_OVERLAY="${SRC_ROOT}/overlays/overlay-${BOARD}"
-
-if [ ! -d "${PRIMARY_BOARD_OVERLAY}" ]; then
- warn "No board overlay found. [${PRIMARY_BOARD_OVERLAY}]"
-else
- #
- # Link make.conf.board to the board overlay's make.conf. It must exist.
- #
- BOARD_MAKE_CONF="${PRIMARY_BOARD_OVERLAY}/make.conf"
-
- if [ ! -f "${BOARD_MAKE_CONF}" ]; then
- error "No board make.conf found. [${BOARD_MAKE_CONF}]"
- exit 1
- fi
-
- #
- # Fetch the toolchain from the board overlay.
- #
- BOARD_TOOL_CHAIN="${PRIMARY_BOARD_OVERLAY}/toolchain.conf"
-
- if [ ! -f "${BOARD_TOOL_CHAIN}" ]; then
- error "No board toolchain.conf found. [${BOARD_TOOL_CHAIN}]"
- exit 1
- fi
+PRIMARY_BOARD_OVERLAY=$($SCRIPTS_DIR/bin/cros_overlay_list \
+ --board "$BOARD" \
+ --primary_only)
- FLAGS_toolchain=${FLAGS_toolchain:-$(cat ${BOARD_TOOL_CHAIN})}
-fi
+#
+# Fetch the toolchain from the board overlay.
+#
+BOARD_TOOL_CHAIN="${PRIMARY_BOARD_OVERLAY}/toolchain.conf"
+FLAGS_toolchain=${FLAGS_toolchain:-$(cat ${BOARD_TOOL_CHAIN})}
# Figure out ARCH from the given toolchain
# TODO: Move to common.sh as a function after scripts are switched over.
« no previous file with comments | « chromeos/scripts/build_packages ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698