From e57b7203b84dede74af0c2f88f85b797084adc47 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 4 Dec 2023 02:36:23 +0300 Subject: [PATCH] Use cmake3 on RHEL 7 --- rpm/vitastor-el7.Dockerfile | 1 + rpm/vitastor-el7.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rpm/vitastor-el7.Dockerfile b/rpm/vitastor-el7.Dockerfile index 80166c66..05c3f187 100644 --- a/rpm/vitastor-el7.Dockerfile +++ b/rpm/vitastor-el7.Dockerfile @@ -15,6 +15,7 @@ RUN yumdownloader --disablerepo=centos-sclo-rh --source fio RUN rpm --nomd5 -i fio*.src.rpm RUN rm -f /etc/yum.repos.d/CentOS-Media.repo RUN cd ~/rpmbuild/SPECS && yum-builddep -y fio.spec +RUN yum -y install cmake3 ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root diff --git a/rpm/vitastor-el7.spec b/rpm/vitastor-el7.spec index d7ddbe38..b13c6b0e 100644 --- a/rpm/vitastor-el7.spec +++ b/rpm/vitastor-el7.spec @@ -16,7 +16,7 @@ BuildRequires: jerasure-devel BuildRequires: libisa-l-devel BuildRequires: gf-complete-devel BuildRequires: libibverbs-devel -BuildRequires: cmake +BuildRequires: cmake3 Requires: vitastor-osd = %{version}-%{release} Requires: vitastor-mon = %{version}-%{release} Requires: vitastor-client = %{version}-%{release} @@ -94,7 +94,7 @@ Vitastor fio drivers for benchmarking. %build . /opt/rh/devtoolset-9/enable -%cmake . +%cmake3 . %make_build