mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-20 21:21:32 +02:00
fix(*): remove lingering broken support for board overlays.
This is a feature from the chromeos sdk that we haven't used and doesn't work any more. Clean it up...
This commit is contained in:
parent
8454976f2d
commit
6d414d275e
@ -81,25 +81,6 @@ _board_sysroot() {
|
||||
_complete_board_sysroot_flag && return 0
|
||||
}
|
||||
|
||||
# echo the existing target board overlays
|
||||
_board_overlays() {
|
||||
local overlaydir=../overlays
|
||||
if [ -d ${overlaydir} ]; then
|
||||
echo $(command ls $overlaydir | grep overlay- | sed s,overlay-,,)
|
||||
fi
|
||||
}
|
||||
|
||||
# Completion for --board= argument for existing board overlays
|
||||
_board_overlay() {
|
||||
_flag_complete && return 0
|
||||
|
||||
COMPREPLY=()
|
||||
local arg=$(_argeq --board)
|
||||
if [[ ${arg} == --board=* ]]; then
|
||||
COMPREPLY=( $(compgen -W "$(_board_overlays)" -- ${arg#--board=}) )
|
||||
fi
|
||||
}
|
||||
|
||||
# Completion for -c and -s argument for autotest script
|
||||
_ls_autotest() {
|
||||
local autotest_dir=../third_party/autotest/files
|
||||
@ -252,7 +233,6 @@ complete -o bashdefault -o default -F _board_sysroot \
|
||||
build_packages \
|
||||
image_to_usb.sh \
|
||||
mod_image_for_test.sh
|
||||
complete -o bashdefault -o default -F _board_overlay setup_board
|
||||
complete -o bashdefault -o default -o nospace -F _autotest_complete autotest
|
||||
complete -F _cros_workon cros_workon
|
||||
complete -F _complete_repo repo
|
||||
|
@ -84,13 +84,6 @@ check_gsutil_opts
|
||||
|
||||
parse_build_image_args
|
||||
|
||||
for overlay in $(cros_list_overlays --board "$BOARD"); do
|
||||
setup_sh="${overlay}/scripts/board_specific_setup.sh"
|
||||
if [[ -e ${setup_sh} ]]; then
|
||||
source "${setup_sh}"
|
||||
fi
|
||||
done
|
||||
|
||||
BASE_PACKAGE="coreos-base/coreos"
|
||||
|
||||
PRISTINE_IMAGE_NAME=${CHROMEOS_BASE_IMAGE_NAME}
|
||||
|
@ -19,12 +19,6 @@ cgpt_py() {
|
||||
|
||||
get_disk_layout_path() {
|
||||
DISK_LAYOUT_PATH="${BUILD_LIBRARY_DIR}/legacy_disk_layout.json"
|
||||
for overlay in $(cros_list_overlays --board "$BOARD"); do
|
||||
local disk_layout="${overlay}/scripts/disk_layout.json"
|
||||
if [[ -e ${disk_layout} ]]; then
|
||||
DISK_LAYOUT_PATH=${disk_layout}
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
write_partition_table() {
|
||||
|
12
common.sh
12
common.sh
@ -373,14 +373,6 @@ DEFAULT_CHROOT_DIR=${CHROMEOS_CHROOT_DIR:-"${GCLIENT_ROOT}/chroot"}
|
||||
# they don't pollute the source directory.
|
||||
DEFAULT_BUILD_ROOT=${CHROMEOS_BUILD_ROOT:-"${SRC_ROOT}/build"}
|
||||
|
||||
# Set up a global ALL_BOARDS value
|
||||
if [[ -d ${SRC_ROOT}/overlays ]]; then
|
||||
ALL_BOARDS=$(cd "${SRC_ROOT}/overlays"; \
|
||||
ls -1d overlay-* 2>&- | sed 's,overlay-,,g')
|
||||
fi
|
||||
# Normalize whitespace.
|
||||
ALL_BOARDS=$(echo ${ALL_BOARDS})
|
||||
|
||||
# Sets the default board variable for calling script.
|
||||
if [[ -f ${GCLIENT_ROOT}/src/scripts/.default_board ]]; then
|
||||
DEFAULT_BOARD=$(<"${GCLIENT_ROOT}/src/scripts/.default_board")
|
||||
@ -390,10 +382,6 @@ if [[ -f ${GCLIENT_ROOT}/src/scripts/.default_board ]]; then
|
||||
"'${DEFAULT_BOARD}'"
|
||||
fi
|
||||
fi
|
||||
# Stub to get people to upgrade.
|
||||
get_default_board() {
|
||||
warn "please upgrade your script, and make sure to run build_packages"
|
||||
}
|
||||
|
||||
# Enable --fast by default.
|
||||
DEFAULT_FAST=${FLAGS_TRUE}
|
||||
|
@ -35,8 +35,6 @@ show_help_if_requested "$@"
|
||||
# not needed for the typical developer workflow.
|
||||
DEFINE_string accept_licenses "" \
|
||||
"Licenses to append to the accept list."
|
||||
DEFINE_string board_overlay "" \
|
||||
"Location of the board overlay."
|
||||
DEFINE_boolean fast "${DEFAULT_FAST}" \
|
||||
"Use the parallel_emerge wrapper script."
|
||||
DEFINE_integer jobs "${NUM_JOBS}" \
|
||||
|
Loading…
x
Reference in New Issue
Block a user