You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by ar...@apache.org on 2022/06/27 23:34:40 UTC
[tvm] 32/34: install cmake from ppa in all images
This is an automated email from the ASF dual-hosted git repository.
areusch pushed a commit to branch areusch/freeze-dependencies
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit eeb89b6f0736bebda4b74dc18a54a179fda4dbf3
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Mon Jun 27 13:52:33 2022 -0700
install cmake from ppa in all images
---
docker/install/ubuntu_install_core.sh | 9 ++++++++-
docker/install/ubuntu_install_zephyr.sh | 9 ---------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/docker/install/ubuntu_install_core.sh b/docker/install/ubuntu_install_core.sh
index 9ac2444500..563c008da0 100755
--- a/docker/install/ubuntu_install_core.sh
+++ b/docker/install/ubuntu_install_core.sh
@@ -27,11 +27,12 @@ export DEBIAN_FRONTEND=noninteractive # avoid tzdata interactive config.
apt-get update && apt-install-and-clear -y --no-install-recommends \
apt-transport-https \
ca-certificates \
- cmake \
curl \
g++ \
gdb \
git \
+ gpg \
+ gpg-agent \
graphviz \
libcurl4-openssl-dev \
libopenblas-dev \
@@ -46,3 +47,9 @@ apt-get update && apt-install-and-clear -y --no-install-recommends \
sudo \
unzip \
wget \
+
+wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
+apt-get update && apt-install-and-clear -y --no-install-recommends \
+ cmake=3.16.5-0kitware1 \
+ cmake-data=3.16.5-0kitware1 \
diff --git a/docker/install/ubuntu_install_zephyr.sh b/docker/install/ubuntu_install_zephyr.sh
index 05ffaaebd8..2d97d12e55 100755
--- a/docker/install/ubuntu_install_zephyr.sh
+++ b/docker/install/ubuntu_install_zephyr.sh
@@ -33,15 +33,6 @@ sudo apt-install-and-clear -y --no-install-recommends \
python3-dev python3-pip python3-setuptools python3-tk python3-wheel python3-venv \
xz-utils file make gcc gcc-multilib g++-multilib apt-transport-https
-wget --no-verbose https://apt.kitware.com/keys/kitware-archive-latest.asc
-sudo apt-key add kitware-archive-latest.asc
-
-echo deb https://apt.kitware.com/ubuntu/ bionic main\
- >> /etc/apt/sources.list.d/kitware.list
-sudo apt-get update
-
-sudo apt-install-and-clear -y cmake
-
python3 -mvenv /venv/west
. /venv/west/bin/activate
pip3 install -U pip