This is an automated email from the ASF dual-hosted git repository.
masahi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new fbede4c use python3.7 install script in ci-qemu (#10799)
fbede4c is described below
commit fbede4c2e2c85ba6902a86f7b92301948cfb1894
Author: Thomas Viehmann <[email protected]>
AuthorDate: Mon Mar 28 08:03:10 2022 +0200
use python3.7 install script in ci-qemu (#10799)
* use python3.7 install script in ci-qemu
* update pyton venv to 3.7
* setuptools is just python3...
* don't use apt-add-repository (breaks with python3.7 as python3 on ubuntu
18.04
---
docker/Dockerfile.ci_qemu | 3 +++
docker/install/ubuntu1804_install_python_venv.sh | 2 +-
docker/install/ubuntu_install_zephyr.sh | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/docker/Dockerfile.ci_qemu b/docker/Dockerfile.ci_qemu
index d4b496f..efc9eb0 100644
--- a/docker/Dockerfile.ci_qemu
+++ b/docker/Dockerfile.ci_qemu
@@ -24,6 +24,9 @@ RUN apt-get update --fix-missing
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
RUN bash /install/ubuntu_install_core.sh
+COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
+RUN bash /install/ubuntu1804_install_python.sh
+
COPY install/ubuntu1804_install_python_venv.sh
/install/ubuntu1804_install_python_venv.sh
RUN bash /install/ubuntu1804_install_python_venv.sh
ENV
PATH=/opt/tvm-venv/bin:/opt/zephyr-sdk/sysroots/x86_64-pokysdk-linux/usr/bin:$PATH
diff --git a/docker/install/ubuntu1804_install_python_venv.sh
b/docker/install/ubuntu1804_install_python_venv.sh
index fe234e0..5dc5efe 100755
--- a/docker/install/ubuntu1804_install_python_venv.sh
+++ b/docker/install/ubuntu1804_install_python_venv.sh
@@ -23,7 +23,7 @@ set -o pipefail
# install python and pip, don't modify this, modify install_python_package.sh
apt-get update
apt-get install -y software-properties-common
-apt-get install -y python3-dev python3-setuptools python3-venv
+apt-get install -y python3.7-dev python3-setuptools python3.7-venv
python3 -mvenv /opt/tvm-venv
diff --git a/docker/install/ubuntu_install_zephyr.sh
b/docker/install/ubuntu_install_zephyr.sh
index b2cf1c0..1237f91 100644
--- a/docker/install/ubuntu_install_zephyr.sh
+++ b/docker/install/ubuntu_install_zephyr.sh
@@ -36,7 +36,8 @@ sudo apt-get install -y --no-install-recommends \
wget --no-verbose https://apt.kitware.com/keys/kitware-archive-latest.asc
sudo apt-key add kitware-archive-latest.asc
-sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
+echo deb https://apt.kitware.com/ubuntu/ bionic main\
+ >> /etc/apt/sources.list.d/kitware.list
sudo apt-get update
sudo apt-get install -y cmake
