osbuilder: Remove leftover pieces related to cmake

The osbuilder scripts include a bunch of code for installing cmake, even
though cmake is never invoked.  versions.yaml claims it's needed to build
grpc-rs, but that doesn't appear to be in our dependency graph.

Presumably, we used to need this, but don't any more.  So, remove all cmake
references.

Fixes #1309

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson
2021-01-21 20:20:34 +11:00
parent 4de21e3d95
commit 3718df69c2
13 changed files with 0 additions and 60 deletions

View File

@@ -33,8 +33,6 @@ RUN yum -y update && yum install -y \
vim \
which
# install cmake because centos7's cmake is too old
@INSTALL_CMAKE@
@INSTALL_MUSL@
# This will install the proper golang to build Kata components
@INSTALL_GO@

View File

@@ -12,7 +12,6 @@ RUN dnf -y update && dnf install -y \
automake \
binutils \
chrony \
cmake \
coreutils \
curl \
curl \

View File

@@ -13,7 +13,6 @@ RUN apt-get update && apt-get install -y \
binutils \
build-essential \
chrony \
cmake \
coreutils \
curl \
debianutils \

View File

@@ -15,7 +15,6 @@ RUN apt-get update && apt-get --no-install-recommends install -y \
build-essential \
ca-certificates \
chrony \
cmake \
coreutils \
curl \
debianutils \

View File

@@ -12,7 +12,6 @@ RUN dnf -y update && dnf install -y \
automake \
binutils \
chrony \
cmake \
coreutils \
curl \
gcc \

View File

@@ -17,7 +17,6 @@ GO_AGENT_PKG=${GO_AGENT_PKG:-github.com/kata-containers/agent}
RUST_AGENT_PKG=${RUST_AGENT_PKG:-github.com/kata-containers/kata-containers}
RUST_AGENT=${RUST_AGENT:-yes}
RUST_VERSION="null"
CMAKE_VERSION=${CMAKE_VERSION:-"null"}
MUSL_VERSION=${MUSL_VERSION:-"null"}
AGENT_BIN=${AGENT_BIN:-kata-agent}
AGENT_INIT=${AGENT_INIT:-no}
@@ -354,11 +353,6 @@ build_rootfs_distro()
echo "Required rust version: $RUST_VERSION"
detect_cmake_version ||
die "Could not detect the required cmake version for AGENT_VERSION='${AGENT_VERSION:-master}'."
echo "Required cmake version: $CMAKE_VERSION"
detect_musl_version ||
die "Could not detect the required musl version for AGENT_VERSION='${AGENT_VERSION:-master}'."

View File

@@ -28,7 +28,6 @@ zypper --non-interactive install --no-recommends --force-resolution \
autoconf \
automake \
binutils \
cmake \
coreutils \
curl \
gcc \

View File

@@ -17,7 +17,6 @@ RUN apt-get update && apt-get install -y \
binutils \
build-essential \
chrony \
cmake \
coreutils \
curl \
debianutils \

View File

@@ -19,7 +19,6 @@ RUN apt-get update && apt-get --no-install-recommends install -y \
build-essential \
ca-certificates \
chrony \
cmake \
coreutils \
curl \
debianutils \