git-rb-all: handle more edge cases

[home.git] / .bin / cros-board

diff --git a/.bin/cros-board b/.bin/cros-board
index e6743cee0a914d9ada14657da3cab609b0ebea39..066804f2ee1f634d1664b88f17ae48fff92deb13 100755 (executable)
--- a/.bin/cros-board
+++ b/.bin/cros-board
@@ -3,13 +3,16 @@
 die() { eerror "$*"; exit 1; }
 set -e
 
-cd "${HOME}/trunk/src/scripts/"
+BASE="/mnt/host/source"
+d="${BASE}/src/scripts"
+BUILD_DIR="${BASE}/src/build"
+cd "${BASE}/src/scripts/"
 
 : "${BOARD:="$(cat .default_board 2>/dev/null)"}"
 if [[ -z ${BOARD} ]] ; then
        die "missing BOARD"
 fi
-IMAGES="${HOME}/trunk/src/build/images/${BOARD}"
+IMAGES="${BASE}/src/build/images/${BOARD}"
 BUILD="/build/${BOARD}"
 
 usage() {
@@ -103,8 +106,8 @@ run ./update_chroot --toolchain_boards=${BOARD}
 
 if ${ARG_CLEAN} || [[ ! -d ${BUILD} ]] ; then
        run sudo rm -rf "${BUILD}"
-       run ./setup_board --board=${BOARD} --skip_chroot_upgrade
-       if [ $? -ne 0 ] ; then
+       run setup_board --board=${BOARD} --skip-chroot-upgrade
+       if [[ $? -ne 0 ]] ; then
                run sudo rm -rf "${BUILD}"
                exit 1
        fi
@@ -114,12 +117,13 @@ run ./build_packages \
        --board=${BOARD} \
        --nowithdebug \
        --nowithrevdeps \
-       --skip_chroot_upgrade \
+       --skip-chroot-upgrade \
+       --autosetgov \
        $(tfe ${ARG_AUTOTEST} --{,no}withautotest) \
        $(tfe ${ARG_FACTORY} --{,no}withfactory) \
        $(tfe ${ARG_NOPKG} --{no,}usepkg) \
        $(tfe ${ARG_TEST} --{,no}withtest)
-BUILD_IMG="./build_image --board=${BOARD} --noenable_rootfs_verification $(tfe ${ARG_TEST} test) dev"
+BUILD_IMG="./build_image --board=${BOARD} --noenable_rootfs_verification $(tfe ${ARG_TEST} test base)"
 run ${BUILD_IMG}
 
 IMG_TO_USB="cros flash --yes usb://${ARG_DEV} xbuddy://local/${BOARD}/latest/dev"
@@ -131,7 +135,6 @@ fi
 cd "${IMAGES}"
 rm -rf $(ls -td1R `find -mindepth 1 -maxdepth 1 -type d` | sed -e 1d -e 2d)
 
-d="~/trunk/src/scripts"
 BUILD_IMG="${d}/${BUILD_IMG#./}"
 cat <<EOF
 
@@ -139,9 +142,7 @@ cat <<EOF
 ${IMG_TO_USB}
 
 ### KVM
-${d}/image_to_vm.sh --board=${BOARD} --from=../build/images/${BOARD}/latest
-${d}/image_to_vm.sh --board=${BOARD} --from=../build/images/${BOARD}/latest --test_image
-~/chromiumos/chromite/bin/cros_vm --start --no-display --image-path=\${HOME}/chromiumos/src/build/images/${BOARD}/latest/chromiumos_qemu_image.bin
+~/chromiumos/chromite/bin/cros_vm --board=${BOARD} --start --no-display --image-path=\${HOME}/chromiumos/src/build/images/${BOARD}/latest/chromiumos_test_image.bin
 #--kvm_cpu "max,vmx=on"
 
 https://dev.chromium.org/chromium-os/testing/running-smoke-suite-on-a-vm-image