Remove qemu installation from Zephyr RVM (apache#8701)

ylc · Sep 29, 2021 · 9daf033 · 9daf033
1 parent acf18b0
commit 9daf033
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/apps/microtvm/reference-vm/base-box-tool.py b/apps/microtvm/reference-vm/base-box-tool.py
@@ -178,10 +178,7 @@ def attach_vmware(uuid, vid_hex=None, pid_hex=None, serial=None):
 
 # Extra scripts required to execute on provisioning
 # in zephyr/base-box/base_box_provision.sh
-EXTRA_SCRIPTS = (
-    "docker/install/ubuntu_init_zephyr_project.sh",
-    "docker/install/ubuntu_install_qemu.sh",
-)
+EXTRA_SCRIPTS = ("docker/install/ubuntu_init_zephyr_project.sh",)
 
 
 def generate_packer_config(file_path, providers):

diff --git a/apps/microtvm/reference-vm/zephyr/base-box/base_box_provision.sh b/apps/microtvm/reference-vm/zephyr/base-box/base_box_provision.sh
@@ -30,8 +30,5 @@ cd ~
 # Using most recent commit that passes all the tests.
 ~/ubuntu_init_zephyr_project.sh ~/zephyr v2.5-branch --commit dabf23758417fd041fec2a2a821d8f526afac29d
 
-# Build QEMU
-sudo ~/ubuntu_install_qemu.sh --target-list arm-softmmu
-
 # Cleanup
 rm -f *.sh
diff --git a/apps/microtvm/reference-vm/zephyr/provision_setup.sh b/apps/microtvm/reference-vm/zephyr/provision_setup.sh
@@ -47,3 +47,4 @@ poetry run pip3 install -r ${ZEPHYR_BASE}/scripts/requirements.txt
 echo "export TVM_LIBRARY_PATH=\"$TVM_HOME\"/build-microtvm" >>~/.profile
 echo "VENV_PATH=\$((cd \"$TVM_HOME\"/apps/microtvm/reference-vm/zephyr && poetry env list --full-path) | sed -E 's/^(.*)[[:space:]]\(Activated\)\$/\1/g')" >>~/.profile
 echo "source \$VENV_PATH/bin/activate" >>~/.profile
+echo "export PATH=\"\${PATH}:\${HOME}/zephyr-sdk/sysroots/x86_64-pokysdk-linux/usr/bin\"" >>~/.profile
diff --git a/tutorials/micro/micro_reference_vm.py b/tutorials/micro/micro_reference_vm.py
@@ -151,7 +151,6 @@
 .. code-block:: bash
 
     $ cd /Users/yourusername/path/to/tvm
-    $ sudo ./docker/install/ubuntu_install_qemu.sh
     $ cd apps/microtvm/reference-vm/zephyr/
     $ poetry run pytest ../../../../tests/micro/qemu/test_zephyr.py --microtvm-platforms=host