diff options
author | Mike Frysinger <vapier@chromium.org> | 2018-08-05 00:47:48 -0400 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-08-07 11:04:53 -0700 |
commit | cde23a8e45b6202ad39ea17999efa5fff1adfeba (patch) | |
tree | 2e65b35b8dbc6138ef1b7546c3cebdf207b866ef | |
parent | 4a3dce09b5295b0d21129ec68660b96dfb3776e5 (diff) | |
download | toolchain-utils-cde23a8e45b6202ad39ea17999efa5fff1adfeba.tar.gz |
import toolchain_utils.sh
This is the only repo that uses these funcs anymore, so move them
here so we can delete the source file entirely.
BUG=None
TEST=precq passes
Change-Id: Ie3cfa2168783999f3a02df20957755ae4c6c46af
Reviewed-on: https://chromium-review.googlesource.com/1163163
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Caroline Tice <cmtice@chromium.org>
-rw-r--r-- | cros_utils/misc.py | 3 | ||||
-rw-r--r-- | cros_utils/toolchain_utils.sh | 32 |
2 files changed, 34 insertions, 1 deletions
diff --git a/cros_utils/misc.py b/cros_utils/misc.py index 939ed66b..f9034b89 100644 --- a/cros_utils/misc.py +++ b/cros_utils/misc.py @@ -18,7 +18,8 @@ import command_executer import logger CHROMEOS_SCRIPTS_DIR = '~/trunk/src/scripts' -TOOLCHAIN_UTILS_PATH = '~/trunk/src/platform/dev/toolchain_utils.sh' +TOOLCHAIN_UTILS_PATH = ('/mnt/host/source/src/third_party/toolchain-utils/' + 'cros_utils/toolchain_utils.sh') def GetChromeOSVersionFromLSBVersion(lsb_version): diff --git a/cros_utils/toolchain_utils.sh b/cros_utils/toolchain_utils.sh new file mode 100644 index 00000000..5e9a2a32 --- /dev/null +++ b/cros_utils/toolchain_utils.sh @@ -0,0 +1,32 @@ +#!/bin/bash +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# TODO: Convert this to python. + +get_all_board_toolchains() +{ + cros_setup_toolchains --show-board-cfg="$1" | sed 's:,: :g' +} + +get_ctarget_from_board() +{ + local all_toolchains=( $(get_all_board_toolchains "$@") ) + echo "${all_toolchains[0]}" +} + +get_board_arch() +{ + local ctarget=$(get_ctarget_from_board "$@") + + # Ask crossdev what the magical portage arch is! + local arch=$(eval $(crossdev --show-target-cfg "${ctarget}"); echo ${arch}) + if [[ -z ${arch} ]] ; then + error "Unable to determine ARCH from toolchain: ${ctarget}" + return 1 + fi + + echo "${arch}" + return 0 +} |