From 8b2a4c95392ee2fb06b1bc38b79482ce0610c337 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 10 Jul 2021 11:01:14 +0300 Subject: [PATCH] Fix centos builds (yum-builddep stopped working in el7, cmake in el8..) --- rpm/vitastor-el7.Dockerfile | 4 ++-- rpm/vitastor-el8.Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm/vitastor-el7.Dockerfile b/rpm/vitastor-el7.Dockerfile index 6df2805c..b7458f3c 100644 --- a/rpm/vitastor-el7.Dockerfile +++ b/rpm/vitastor-el7.Dockerfile @@ -15,8 +15,8 @@ RUN yumdownloader --disablerepo=centos-sclo-rh --source fio RUN rpm --nomd5 -i qemu*.src.rpm RUN rpm --nomd5 -i fio*.src.rpm RUN rm -f /etc/yum.repos.d/CentOS-Media.repo -RUN cd ~/rpmbuild/SPECS && yum-builddep -y --enablerepo='*' --disablerepo=centos-sclo-rh --disablerepo=centos-sclo-rh-source --disablerepo=centos-sclo-sclo-testing qemu-kvm.spec -RUN cd ~/rpmbuild/SPECS && yum-builddep -y --enablerepo='*' --disablerepo=centos-sclo-rh --disablerepo=centos-sclo-rh-source --disablerepo=centos-sclo-sclo-testing fio.spec +RUN cd ~/rpmbuild/SPECS && yum-builddep -y qemu-kvm.spec +RUN cd ~/rpmbuild/SPECS && yum-builddep -y fio.spec RUN yum -y install rdma-core-devel ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root diff --git a/rpm/vitastor-el8.Dockerfile b/rpm/vitastor-el8.Dockerfile index ce519336..96a96a69 100644 --- a/rpm/vitastor-el8.Dockerfile +++ b/rpm/vitastor-el8.Dockerfile @@ -15,7 +15,7 @@ RUN rpm --nomd5 -i qemu*.src.rpm RUN rpm --nomd5 -i fio*.src.rpm RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec qemu-kvm.spec RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec fio.spec && dnf install -y cmake -RUN yum -y install libibverbs-devel +RUN yum -y install libibverbs-devel libarchive ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root