diff --git a/README.md b/README.md index 0d180aba..3b857aaf 100644 --- a/README.md +++ b/README.md @@ -295,9 +295,6 @@ 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` @@ -308,7 +305,7 @@ Vitastor with single-thread NBD on the same hardware: - 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` -- Install packages: `yum/dnf install vitastor lpsolve etcd kernel-ml` +- Install packages: `yum/dnf install vitastor lpsolve etcd kernel-ml qemu-kvm` ### Building from Source @@ -323,7 +320,7 @@ Vitastor with single-thread NBD on the same hardware: - Install node.js 10 or newer. - Install gcc and g++ 8.x or newer. - Clone https://yourcmc.ru/git/vitalif/vitastor/ with submodules. -- Install QEMU 2.0+, get its source, begin to build it, stop the build and copy headers: +- Install QEMU 3.0+, get its source, begin to build it, stop the build and copy headers: - `/include` → `/qemu/include` - Debian: * Use qemu packages from the main repository diff --git a/rpm/vitastor-el7.Dockerfile b/rpm/vitastor-el7.Dockerfile index 16852e36..d9a36466 100644 --- a/rpm/vitastor-el7.Dockerfile +++ b/rpm/vitastor-el7.Dockerfile @@ -1,18 +1,20 @@ # Build packages for CentOS 7 inside a container # cd ..; podman build -t vitastor-el7 -v `pwd`/build:/root/build -f rpm/vitastor-el7.Dockerfile . +# localedef -i ru_RU -f UTF-8 ru_RU.UTF-8 FROM centos:7 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 --disablerepo=centos-sclo-rh --source qemu +RUN yum -y install https://vitastor.io/rpms/centos/7/vitastor-release-1.0-1.el7.noarch.rpm +RUN yum -y install devtoolset-9-gcc-c++ devtoolset-9-libatomic-devel gperftools-devel qemu-kvm fio rh-nodejs12 +RUN yumdownloader --disablerepo=centos-sclo-rh --source qemu-kvm 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.spec +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 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 685a4316..ce8ba3f8 100644 --- a/rpm/vitastor-el7.spec +++ b/rpm/vitastor-el7.spec @@ -13,7 +13,7 @@ BuildRequires: devtoolset-9-gcc-c++ BuildRequires: rh-nodejs12 BuildRequires: rh-nodejs12-npm Requires: fio = 3.7-1.el7 -Requires: qemu = 2.0.0-1.el7.6 +Requires: qemu-kvm = 2.0.0-1.el7.6 Requires: rh-nodejs12 Requires: rh-nodejs12-npm Requires: liburing >= 0.6