Fix RPATH for CentOS builds, add additional repos into the CentOS installation instructions

Vitaliy Filippov 2020-12-02 12:48:11 +03:00
parent 959089b919
commit 59c29b0cee
4 changed files with 14 additions and 8 deletions

View File

@ -295,10 +295,16 @@ Vitastor with single-thread NBD on the same hardware:
### CentOS
- CentOS 7 build is broken because QEMU 2.0 doesn't support dynamic module loading at all.
A decision on this issue will be made soon - CentOS 7 build will either be removed or
a newer QEMU version will be packaged.
- Add Vitastor package repository:
- CentOS 7: `yum install https://vitastor.io/rpms/centos/7/vitastor-release-1.0-1.el7.noarch.rpm`
- CentOS 8: `dnf install https://vitastor.io/rpms/centos/8/vitastor-release-1.0-1.el8.noarch.rpm`
- Enable EPEL: `yum/dnf install epel-release`
- Enable additional CentOS repositories:
- CentOS 7: `yum install centos-release-scl`
- CentOS 8: `dnf install centos-release-advanced-virtualization`
- Enable elrepo-kernel:
- CentOS 7: `yum install https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm`
- CentOS 8: `dnf install https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm`

View File

@ -7,13 +7,13 @@ WORKDIR /root
RUN yum -y --enablerepo=extras install centos-release-scl epel-release yum-utils rpm-build
RUN yum -y install devtoolset-9-gcc-c++ devtoolset-9-libatomic-devel gperftools-devel qemu fio rh-nodejs12
RUN yumdownloader --source qemu
RUN yumdownloader --source fio
RUN yumdownloader --disablerepo=centos-sclo-rh --source qemu
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='*' qemu.spec
RUN cd ~/rpmbuild/SPECS && yum-builddep -y --enablerepo='*' fio.spec
RUN cd ~/rpmbuild/SPECS && yum-builddep -y --enablerepo='*' --disablerepo=centos-sclo-rh --disablerepo=centos-sclo-rh-source --disablerepo=centos-sclo-sclo-testing qemu.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
ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root

View File

@ -1,6 +1,6 @@
Name: vitastor
Version: 0.5
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Vitastor, a fast software-defined clustered block storage
License: Vitastor Network Public License 1.0
@ -31,7 +31,7 @@ size with configurable redundancy (replication or erasure codes/XOR).
%build
. /opt/rh/devtoolset-9/enable
make %{?_smp_mflags}
make %{?_smp_mflags} BINDIR=%_bindir LIBDIR=%_libdir QEMU_PLUGINDIR=%_libdir/qemu-kvm
%install

View File

@ -1,6 +1,6 @@
Name: vitastor
Version: 0.5
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Vitastor, a fast software-defined clustered block storage
License: Vitastor Network Public License 1.0
@ -29,7 +29,7 @@ size with configurable redundancy (replication or erasure codes/XOR).
%build
. /opt/rh/gcc-toolset-9/enable
make %{?_smp_mflags}
make %{?_smp_mflags} BINDIR=%_bindir LIBDIR=%_libdir QEMU_PLUGINDIR=%_libdir/qemu-kvm
%install