X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fcros-board;h=e4a793bf6cfa5e0531015f54f50610f2a77c1f60;hb=ef381d0538598fa92bf81cf1b7bc26bcb88a19d1;hp=1e26e86ff8553468535c038b4542eef84f029a3a;hpb=802321328ba448731cb12ef4df2d9ba304db4b28;p=home.git

diff --git a/.bin/cros-board b/.bin/cros-board
index 1e26e86..e4a793b 100755
--- 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() {
@@ -24,6 +27,7 @@ Options:
   --autotest  Build & install autotest packages.
   --factory   Build factory packages & image.
   --nousepkg  Force build from source.
+  --vm        Create VM image.
 
   --clean     ?
 
@@ -35,8 +39,20 @@ Options:
 EOF
 }
 
+find_first_removable() {
+	local d
+	cd /sys/block
+	for d in sd? ; do
+		if [[ $(cat "${d}/removable" 2>/dev/null) == "1" ]]; then
+			echo "/dev/${d}"
+			return 0
+		fi
+	done
+	return 0
+}
+
 ARG_CLEAN=false
-ARG_DEV="/dev/sdd"
+ARG_DEV="$(find_first_removable)"
 ARG_DEV_USER=false
 ARG_PRETEND=false
 ARG_NOPKG=false
@@ -44,6 +60,7 @@ ARG_AUTOTEST=false
 ARG_FACTORY=false
 ARG_VERBOSE=false
 ARG_TEST=false
+ARG_VM=false
 while [[ $# -ne 0 ]] ; do
 	case $1 in
 	--clean) ARG_CLEAN=true;;
@@ -55,6 +72,7 @@ while [[ $# -ne 0 ]] ; do
 	--nousepkg) ARG_NOPKG=true;;
 	--autotest) ARG_AUTOTEST=true;;
 	--factory) ARG_FACTORY=true;;
+	--vm) ARG_VM=true;;
 	-h) usage;;
 	*) echo "unknown opt: $*"; exit 1;;
 	esac
@@ -75,7 +93,7 @@ run() {
 		piperet
 		eend $? || exit $?
 	else
-		einfo "$*"
+		echo "$*"
 	fi
 	set -e
 }
@@ -91,8 +109,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
@@ -101,12 +119,14 @@ fi
 run ./build_packages \
 	--board=${BOARD} \
 	--nowithdebug \
-	--skip_chroot_upgrade \
+	--nowithrevdeps \
+	--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"
@@ -115,10 +135,14 @@ if ${ARG_DEV_USER} ; then
 	sync &
 fi
 
+IMG_TO_VM=( ${d}/image_to_vm.sh --board=${BOARD} --from=${BUILD_DIR}/images/${BOARD}/latest --test_image )
+if ${ARG_VM} ; then
+	run "${IMG_TO_VM[@]}"
+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
 
@@ -126,15 +150,21 @@ 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/src/scripts/bin/cros_start_vm --no_graphics --image_path=\${HOME}/chromiumos/src/build/images/${BOARD}/latest/chromiumos_qemu_image.bin
-qemu-system-x86_64 -enable-kvm -m 1024 -vga std -net nic,model=virtio -net user,hostfwd=tcp::9222-:22 -hda ~/chromiumos/src/build/images/${BOARD}/latest/chromiumos_qemu_image.bin
-http://dev.chromium.org/chromium-os/testing/running-smoke-suite-on-a-vm-image
+${IMG_TO_VM[*]}
+~/chromiumos/chromite/bin/cros_vm --start --no-display --image-path=\${HOME}/chromiumos/src/build/images/${BOARD}/latest/chromiumos_qemu_image.bin
+#--kvm_cpu "max,vmx=on"
+
+https://dev.chromium.org/chromium-os/testing/running-smoke-suite-on-a-vm-image
+
+/usr/local/autotest/bin/autologin.py
+
+export CROS_USER_ID_HASH=\$(ls /home/user/)
+sudo -u chronos CROS_USER_ID_HASH="${CROS_USER_ID_HASH}" crosh
+  vmc start termina  # might run twice
 
 ### RECOVERY
 ${d}/mod_image_for_recovery.sh --board=${BOARD}
-${IMG_TO_USB} --image_name=recovery_image.bin
+${IMG_TO_USB%/dev}/recovery
 
 ### FACTORY
 ${BUILD_IMG} --factory_install