@@ -26,25 +26,27 @@ if [ $(echo $full_tgtname | cut -d ':' -f 1) = "centos" ]; then
2626
2727 echo " RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*" >> $filename
2828 echo " RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*" >> $filename
29- echo ' RUN yum group install "Development Tools" -y && yum clean all' >> $filename
29+ echo ' RUN yum group install "Development Tools" -y && (yum install -y cmake3 || yum install -y cmake) && yum clean all' >> $filename
30+ echo ' RUN [ -x /usr/bin/cmake ] || ln -s /usr/bin/cmake3 /usr/bin/cmake' >> $filename
3031fi
3132if [ $( echo $full_tgtname | cut -d ' :' -f 1) = " ubuntu" ]; then
32- echo ' RUN apt update && apt -y install build-essential curl' >> $filename
33+ echo ' RUN apt update && apt -y install build-essential curl cmake ' >> $filename
3334fi
3435if [ $( echo $full_tgtname | cut -d ' :' -f 1) = " fedora" ]; then
35- echo ' RUN dnf -y update && dnf -y install @development-tools' >> $filename
36+ echo ' RUN dnf -y update && dnf -y install @development-tools cmake ' >> $filename
3637fi
3738if [ $( echo $full_tgtname | cut -d ' :' -f 1) = " debian" ]; then
38- echo ' RUN apt update && apt -y install build-essential curl gcc make' >> $filename
39+ echo ' RUN apt update && apt -y install build-essential curl gcc make cmake ' >> $filename
3940fi
4041if [ $( echo $full_tgtname | cut -d ' :' -f 1) = " almalinux" ]; then
4142 if [ $( echo $full_tgtname | cut -d ' :' -f 2 | cut -d ' .' -f 1) = ' 8' ]; then
4243 echo ' RUN rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux' >> $filename
4344 fi
44- echo ' RUN dnf -y update && dnf -y group install "Development Tools"' >> $filename
45+ echo ' RUN dnf -y update && dnf -y group install "Development Tools" && (dnf -y install cmake || dnf -y install cmake3)' >> $filename
46+ echo ' RUN [ -x /usr/bin/cmake ] || ln -s /usr/bin/cmake3 /usr/bin/cmake' >> $filename
4547fi
4648if [[ $( echo $full_tgtname | cut -d ' :' -f 1) == " redhat" * ]]; then
47- echo ' RUN dnf -y install gcc' >> $filename
49+ echo ' RUN dnf -y install gcc cmake ' >> $filename
4850fi
4951echo >> $filename
5052echo ' ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo' >> $filename
@@ -55,4 +57,3 @@ echo ' curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stabl
5557echo ' chmod -R a=rwX $CARGO_HOME' >> $filename
5658echo >> $filename
5759echo ' WORKDIR /source' >> $filename
58-
0 commit comments