From 812dc0bcabd8cabaae2008262bffbc20dc1f28eb Mon Sep 17 00:00:00 2001 From: Thomas Viehmann Date: Mon, 28 Mar 2022 05:18:46 +0200 Subject: [PATCH 1/4] use python3.7 install script in ci-qemu --- docker/Dockerfile.ci_qemu | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile.ci_qemu b/docker/Dockerfile.ci_qemu index d4b496f8d6aa..efc9eb0067ab 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 From efeecaa7706328c9ebd81482e8c53fe43148edde Mon Sep 17 00:00:00 2001 From: Thomas Viehmann Date: Mon, 28 Mar 2022 05:48:10 +0200 Subject: [PATCH 2/4] update pyton venv to 3.7 --- docker/install/ubuntu1804_install_python_venv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/install/ubuntu1804_install_python_venv.sh b/docker/install/ubuntu1804_install_python_venv.sh index fe234e035573..059900e7ef09 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.7-setuptools python3.7-venv python3 -mvenv /opt/tvm-venv From 5e125f2c850bbd592b688e4bf411c368a3e6f15d Mon Sep 17 00:00:00 2001 From: Thomas Viehmann Date: Mon, 28 Mar 2022 05:52:24 +0200 Subject: [PATCH 3/4] setuptools is just python3... --- docker/install/ubuntu1804_install_python_venv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/install/ubuntu1804_install_python_venv.sh b/docker/install/ubuntu1804_install_python_venv.sh index 059900e7ef09..5dc5efea76f6 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.7-dev python3.7-setuptools python3.7-venv +apt-get install -y python3.7-dev python3-setuptools python3.7-venv python3 -mvenv /opt/tvm-venv From 0a79ba7d8cc247ab067bd4c08658e3aae595c917 Mon Sep 17 00:00:00 2001 From: Thomas Viehmann Date: Mon, 28 Mar 2022 06:16:29 +0200 Subject: [PATCH 4/4] don't use apt-add-repository (breaks with python3.7 as python3 on ubuntu 18.04 --- docker/install/ubuntu_install_zephyr.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/install/ubuntu_install_zephyr.sh b/docker/install/ubuntu_install_zephyr.sh index b2cf1c0ba4d3..1237f91a4152 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