Merge pull request #1306 from dgibson/no-cmake

osbuilder: remove traces of cmake

tools/osbuilder/dracut/Dockerfile.in

@@ -10,7 +10,6 @@ RUN zypper --non-interactive refresh; \
     autoconf \
     automake \
     binutils \
-    cmake \
     coreutils \
     cpio \
     curl \

tools/osbuilder/rootfs-builder/centos/Dockerfile.in

@@ -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@

tools/osbuilder/rootfs-builder/clearlinux/Dockerfile.in

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

tools/osbuilder/rootfs-builder/debian/Dockerfile-aarch64.in

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

tools/osbuilder/rootfs-builder/debian/Dockerfile.in

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

tools/osbuilder/rootfs-builder/fedora/Dockerfile.in

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

tools/osbuilder/rootfs-builder/rootfs.sh

@@ -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}'."
 

tools/osbuilder/rootfs-builder/suse/install-packages.sh

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

tools/osbuilder/rootfs-builder/ubuntu/Dockerfile-aarch64.in

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

tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in

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

tools/osbuilder/scripts/lib.sh

@@ -7,7 +7,6 @@
 set -e
 
 KATA_REPO=${KATA_REPO:-github.com/kata-containers/kata-containers}
-CMAKE_VERSION=${CMAKE_VERSION:-"null"}
 MUSL_VERSION=${MUSL_VERSION:-"null"}
 # Give preference to variable set by CI
 yq_file="${script_dir}/../../../ci/install_yq.sh"
@@ -272,18 +271,6 @@ ENV PATH=\$PATH:\$GOROOT/bin:\$GOPATH/bin
 
 	# Rust agent
 	# rust installer should set path apropiately, just in case
-	local cmake_file="cmake-${CMAKE_VERSION}.tar.gz"
-	local cmake_dir="cmake-${CMAKE_VERSION}"
-	readonly install_cmake="
-RUN pushd /root; \
-    curl -sLO https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${cmake_file}; \
-	tar -zxf ${cmake_file}; \
-	cd ${cmake_dir}; \
-	./bootstrap > /dev/null 2>\&1; \
-	make > /dev/null 2>\&1; \
-	make install > /dev/null 2>\&1; \
-	popd
-"
 	# install musl for compiling rust-agent
 	install_musl=
 	if [ "${muslarch}" == "aarch64" ]; then
@@ -346,7 +333,6 @@ RUN ln -sf /usr/bin/g++ /bin/musl-g++
 		sed \
 			-e "s|@GO_VERSION@|${GO_VERSION}|g" \
 			-e "s|@OS_VERSION@|${OS_VERSION:-}|g" \
-			-e "s|@INSTALL_CMAKE@||g" \
 			-e "s|@INSTALL_MUSL@||g" \
 			-e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \
 			-e "s|@INSTALL_RUST@||g" \
@@ -356,7 +342,6 @@ RUN ln -sf /usr/bin/g++ /bin/musl-g++
 		sed \
 			-e "s|@GO_VERSION@|${GO_VERSION}|g" \
 			-e "s|@OS_VERSION@|${OS_VERSION:-}|g" \
-			-e "s|@INSTALL_CMAKE@|${install_cmake//$'\n'/\\n}|g" \
 			-e "s|@INSTALL_MUSL@|${install_musl//$'\n'/\\n}|g" \
 			-e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \
 			-e "s|@INSTALL_RUST@|${install_rust//$'\n'/\\n}|g" \
@@ -394,20 +379,6 @@ detect_rust_version()
 	[ "$?" == "0" ] && [ "$RUST_VERSION" != "null" ]
 }
 
-detect_cmake_version()
-{
-	info "Detecting cmake version"
-	typeset -r yq=$(command -v yq || command -v "${GOPATH}/bin/yq" || echo "${GOPATH}/bin/yq")
-	if [ ! -f "$yq" ]; then
-		source "$yq_file"
-	fi
-
-	info "Get cmake version from ${kata_versions_file}"
-	CMAKE_VERSION="$(cat "${kata_versions_file}"  | $yq r -X - "externals.cmake.version")"
-
-	[ "$?" == "0" ] && [ "$CMAKE_VERSION" != "null" ]
-}
-
 detect_musl_version()
 {
 	info "Detecting musl version"

tools/osbuilder/tests/test_images.sh

@@ -644,8 +644,6 @@ test_dracut()
 		die "Could not detect the required Go version for AGENT_VERSION='${AGENT_VERSION:-master}'."
 	detect_rust_version ||
 		die "Could not detect the required rust version for AGENT_VERSION='${AGENT_VERSION:-master}'."
-	detect_cmake_version ||
-		die "Could not detect the required cmake version for AGENT_VERSION='${AGENT_VERSION:-master}'."
 	detect_musl_version ||
 		die "Could not detect the required musl version for AGENT_VERSION='${AGENT_VERSION:-master}'."
 

versions.yaml

@@ -237,19 +237,6 @@ externals:
       .*/v?(\d\S+)\.tar\.gz
     version: "v1.0.0-rc5"
 
-  cmake:
-    description: |
-      Build system, to build grpc-rs.
-    url: "https://github.com/Kitware/CMake"
-    uscan-url: >-
-      https://github.com/Kitware/CMake/releases/download/
-      v?([\d\.]+)/cmake-([\d\.]+)\.tar\.gz
-    version: "3.15.3"
-    meta:
-      description: |
-        'newest-version' is the latest version known to work.
-      newest-version: "3.15.3"
-
   musl:
     description: |
       The musl library is used to build the rust agent.