mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-08 13:36:58 +02:00
Altered sync_build_test so that when --nousepkg is specified, it is also passed to setup_board.
Review URL: http://codereview.chromium.org/3041033
This commit is contained in:
parent
d868edc220
commit
b1d37f74db
@ -515,20 +515,21 @@ function main() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ${FLAGS_build} -eq ${FLAGS_TRUE} ]]; then
|
if [[ ${FLAGS_build} -eq ${FLAGS_TRUE} ]]; then
|
||||||
|
local pkg_param=""
|
||||||
|
if [[ ${FLAGS_usepkg} -eq ${FLAGS_FALSE} ]]; then
|
||||||
|
pkg_param="--nousepkg"
|
||||||
|
fi
|
||||||
|
|
||||||
chdir_relative src/scripts
|
chdir_relative src/scripts
|
||||||
# Only setup board target if the directory does not exist
|
# Only setup board target if the directory does not exist
|
||||||
if [[ ! -d "${FLAGS_top}/chroot/build/${FLAGS_board}" ]]; then
|
if [[ ! -d "${FLAGS_top}/chroot/build/${FLAGS_board}" ]]; then
|
||||||
run_phase_in_chroot "Setting up board target" \
|
run_phase_in_chroot "Setting up board target" \
|
||||||
./setup_board "${board_param}"
|
./setup_board ${pkg_param} "${board_param}"
|
||||||
fi
|
fi
|
||||||
local build_autotest_param=""
|
local build_autotest_param=""
|
||||||
if [[ ${FLAGS_build_autotest} -eq ${FLAGS_TRUE} ]]; then
|
if [[ ${FLAGS_build_autotest} -eq ${FLAGS_TRUE} ]]; then
|
||||||
build_autotest_param="--withautotest"
|
build_autotest_param="--withautotest"
|
||||||
fi
|
fi
|
||||||
local pkg_param=""
|
|
||||||
if [[ ${FLAGS_usepkg} -eq ${FLAGS_FALSE} ]]; then
|
|
||||||
pkg_param="--nousepkg"
|
|
||||||
fi
|
|
||||||
|
|
||||||
run_phase_in_chroot "Building packages" \
|
run_phase_in_chroot "Building packages" \
|
||||||
./build_packages "${board_param}" \
|
./build_packages "${board_param}" \
|
||||||
|
Loading…
Reference in New Issue
Block a user