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

Side by Side Diff: host/cros_choose_profile

Issue 6849001: adding x86_64 to TC_ARCH (Closed) Base URL: ssh://gitrw.chromium.org:9222/dev-util.git@master
Patch Set: Created 9 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # This script selects a profile from the overlays. 7 # This script selects a profile from the overlays.
8 8
9 # Load common CrOS utilities. Inside the chroot this file is installed in 9 # Load common CrOS utilities. Inside the chroot this file is installed in
10 # /usr/lib/crosutils. Outside the chroot we find it relative to the scripts 10 # /usr/lib/crosutils. Outside the chroot we find it relative to the scripts
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 TC_ARCH=$(awk -F'-' '{ print $1 }' < "${PRIMARY_BOARD_OVERLAY}/toolchain.conf") 79 TC_ARCH=$(awk -F'-' '{ print $1 }' < "${PRIMARY_BOARD_OVERLAY}/toolchain.conf")
80 80
81 case "${TC_ARCH}" in 81 case "${TC_ARCH}" in
82 arm*) 82 arm*)
83 ARCH="arm" 83 ARCH="arm"
84 ;; 84 ;;
85 *86) 85 *86)
86 ARCH="x86" 86 ARCH="x86"
87 ;; 87 ;;
88 x86_64)
89 ARCH="amd64"
90 ;;
88 *) 91 *)
89 error "Unable to determine ARCH from toolchain: ${BOARD_VARIANT}" 92 error "Unable to determine ARCH from toolchain: ${BOARD_VARIANT}"
90 exit 1 93 exit 1
91 esac 94 esac
92 95
93 # The profile directory comes from many possible locations, the <overlay> 96 # The profile directory comes from many possible locations, the <overlay>
94 # values below can be any of the board overlays, public, private, primary 97 # values below can be any of the board overlays, public, private, primary
95 # or variant. The name defaults to base, but can be set using --profile: 98 # or variant. The name defaults to base, but can be set using --profile:
96 # * relative profile name from --profile in <overlay>/profiles/<name> 99 # * relative profile name from --profile in <overlay>/profiles/<name>
97 # * absolute profile path from --profile 100 # * absolute profile path from --profile
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 warn "" 160 warn ""
158 warn "setup_board --board ${BOARD_VARIANT} --force --profile ${PROFILE_NAME}" 161 warn "setup_board --board ${BOARD_VARIANT} --force --profile ${PROFILE_NAME}"
159 warn "" 162 warn ""
160 warn "Alternatively, you can correct the dependecy graph by using" 163 warn "Alternatively, you can correct the dependecy graph by using"
161 warn "'emerge-${BOARD_VARIANT} -c' or 'emerge-${BOARD_VARIANT} -C <ebuild>'" 164 warn "'emerge-${BOARD_VARIANT} -c' or 'emerge-${BOARD_VARIANT} -C <ebuild>'"
162 165
163 sudo rm -f "${MAKE_PROFILE}" 166 sudo rm -f "${MAKE_PROFILE}"
164 fi 167 fi
165 168
166 sudo ln -sf "${PROFILES_DIR}" "${MAKE_PROFILE}" 169 sudo ln -sf "${PROFILES_DIR}" "${MAKE_PROFILE}"
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698