mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 05:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move board overlay calculation into chromite (part 3 of 5)

Browse Source 
This CL adjusts all scripts to use cros_list_overlays from chromite
instead of cros_overlay_list.

BUG=chromium-os:35514
TEST=Trybot runs with all callers adjusted to use
     cros_list_overlays instead of cros_overlay_list.
CQ-DEPEND=CL:36191

Change-Id: I6b147a64744015f6b199b2a00493e6f1e030376b
Reviewed-on: https://gerrit.chromium.org/gerrit/36167
Tested-by: David James <davidjames@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
This commit is contained in:
David James 2012-10-19 16:16:38 -07:00 committed by Gerrit
parent de262e86c7
commit 18a9c2513a
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_image
View File

@ -87,7 +87,7 @@ OVERLAY_CHROMEOS_DIR="${SRC_ROOT}/third_party/chromiumos-overlay/chromeos"
parse_build_image_args parse_build_image_args
for overlay in $(cros_overlay_list --board "$BOARD"); do for overlay in $(cros_list_overlays --board "$BOARD"); do
setup_sh="${overlay}/scripts/board_specific_setup.sh" setup_sh="${overlay}/scripts/board_specific_setup.sh"
if [[ -e ${setup_sh} ]]; then if [[ -e ${setup_sh} ]]; then
source "${setup_sh}" source "${setup_sh}"

2
build_library/disk_layout_util.sh
View File

@ -8,7 +8,7 @@ PARTITION_SCRIPT_PATH="usr/sbin/write_gpt.sh"
get_disk_layout_path() { get_disk_layout_path() {
DISK_LAYOUT_PATH="${BUILD_LIBRARY_DIR}/legacy_disk_layout.json" DISK_LAYOUT_PATH="${BUILD_LIBRARY_DIR}/legacy_disk_layout.json"
local partition_script_path=$(tempfile) local partition_script_path=$(tempfile)
for overlay in $(cros_overlay_list --board "$BOARD"); do for overlay in $(cros_list_overlays --board "$BOARD"); do
local disk_layout="${overlay}/scripts/disk_layout.json" local disk_layout="${overlay}/scripts/disk_layout.json"
if [[ -e ${disk_layout} ]]; then if [[ -e ${disk_layout} ]]; then
DISK_LAYOUT_PATH=${disk_layout} DISK_LAYOUT_PATH=${disk_layout}

7
setup_board
View File

@ -437,10 +437,9 @@ BOARD_PROFILE="${BOARD_ETC}/portage/profile"
# #
# Construct board overlay list. # Construct board overlay list.
# #
BOARD_OVERLAY_LIST=$(cros_overlay_list \ BOARD_OVERLAY_LIST=$(cros_list_overlays \
--board "$BOARD" \ --board "$BOARD_VARIANT" \
--board_overlay "$FLAGS_board_overlay" \ --board_overlay "$FLAGS_board_overlay")
--variant "$VARIANT")
eval $(portageq envvar -v CHOST PKGDIR) eval $(portageq envvar -v CHOST PKGDIR)