setup_board: have --regen_configs rebuild make.conf.board
This lets the option also regenerate the binhost list. Since it's
generally a fast operation, should be fine to include here.
BUG=None
TEST=`./setup_board --regen_configs --board=arm64-generic` rebuilt make.conf.board
Change-Id: Ib06b9093c1b498fe291bc6581111ad1894743dcf
Reviewed-on: https://chromium-review.googlesource.com/255880
Trybot-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/setup_board b/setup_board
index 8007802..cecaf93 100755
--- a/setup_board
+++ b/setup_board
@@ -433,21 +433,23 @@
TEMP_DIR=`mktemp -d`
sudo mv "${BOARD_ROOT}" "${TEMP_DIR}"
sudo rm -rf --one-file-system "${TEMP_DIR}" &
- elif [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
+ else
if ! ${HOST_BOARD}; then
{ print_board_make_conf; print_board_binhost_config; } | \
sudo_clobber $BOARD_ETC/make.conf.board
fi
- if [[ ${FLAGS_quiet} -eq ${FLAGS_FALSE} ]]; then
- warn "Board output directory '$BOARD_ROOT' already exists."
- warn "Not setting up board root. "
- warn "Use --force to clobber the board root and start again."
+ if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
+ if [[ ${FLAGS_quiet} -eq ${FLAGS_FALSE} ]]; then
+ warn "Board output directory '$BOARD_ROOT' already exists."
+ warn "Not setting up board root. "
+ warn "Use --force to clobber the board root and start again."
+ fi
+ if [[ ${FLAGS_skip_board_pkg_init} -eq ${FLAGS_FALSE} ]]; then
+ # Update the users libc in their board if needed.
+ install_toolchain
+ fi
+ exit 0
fi
- if [[ ${FLAGS_skip_board_pkg_init} -eq ${FLAGS_FALSE} ]]; then
- # Update the users libc in their board if needed.
- install_toolchain
- fi
- exit 0
fi
else
# Regenerating configs w/out a board root doesn't make sense.
