From f90b069f64aba3ba29652d3c475bbdb614e4326b Mon Sep 17 00:00:00 2001 From: Sonny Rao Date: Tue, 28 Feb 2012 08:20:05 +0000 Subject: [PATCH] setup_board: add a skip_chroot_upgrade flag We need this if we want to call setup_board from a upgrade script. BUG=chrome-os-partner:8235 TEST=add new upgrade script, run setup_board --skip_version_hooks ensure new upgrade script isn't run Change-Id: I31341d0b9a5c378a8288ab42f8506db90c2299fa Reviewed-on: https://gerrit.chromium.org/gerrit/16941 Commit-Ready: Sonny Rao Reviewed-by: Sonny Rao Tested-by: Sonny Rao --- setup_board | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup_board b/setup_board index db7020615e..0e91e3d83e 100755 --- a/setup_board +++ b/setup_board @@ -69,6 +69,10 @@ DEFINE_boolean skip_toolchain_update $FLAGS_FALSE \ "Don't update toolchain automatically." DEFINE_integer jobs -1 \ "How many packages to build in parallel at maximum." +DEFINE_boolean skip_chroot_upgrade $FLAGS_FALSE \ + "Don't run the chroot upgrade automatically. \ +This should only be called by version hook scripts that need to call \ +setup_board." # builds wrappers like equery-arm-generic. # args: @@ -464,7 +468,9 @@ fi if [[ "${FLAGS_jobs}" -ne -1 ]]; then UPDATE_ARGS+=" --jobs=${FLAGS_jobs}" fi -"${SRC_ROOT}/scripts"/update_chroot ${UPDATE_ARGS} +if [ "${FLAGS_skip_chroot_upgrade}" -eq "${FLAGS_FALSE}" ] ; then + "${SRC_ROOT}/scripts"/update_chroot ${UPDATE_ARGS} +fi get_board_and_variant $FLAGS_board $FLAGS_variant