Merge pull request #38 from jcvenegas/rhel-qemu

qemu: rhel: Remove librados to allow build.
This commit is contained in:
Julio Montes 2018-05-17 10:46:04 -05:00 committed by GitHub
commit ff7349b7fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions

View File

@ -27,12 +27,16 @@ BuildRequires : libtool
BuildRequires : m4
BuildRequires : findutils
%if 0%{?rhel_version} || 0%{?centos_version}
%if 0%{?centos_version}
BuildRequires : librbd1-devel
%else
%if ! 0%{?rhel_version}
BuildRequires : librbd-devel
%endif
%endif
%if 0%{?suse_version}
BuildRequires : libnuma-devel
%else
@ -78,7 +82,14 @@ chmod +x %{_sourcedir}/configure-hypervisor.sh
%build
export LANG=C
eval "%{_sourcedir}/configure-hypervisor.sh" "qemu-lite" | xargs ./configure --prefix=/usr
# RHEL in OBS does not provide librados.
# Remove it: See https://github.com/kata-containers/packaging/issues/36
"%{_sourcedir}/configure-hypervisor.sh" "qemu-lite" \
%if 0%{?rhel_version}
| sed -e 's/--enable-rbd//g' \
%endif
| xargs ./configure --prefix=/usr
make V=1 %{?_smp_mflags}
%install

View File

@ -27,12 +27,16 @@ BuildRequires : libtool
BuildRequires : m4
BuildRequires : findutils
%if 0%{?rhel_version} || 0%{?centos_version}
%if 0%{?centos_version}
BuildRequires : librbd1-devel
%else
%if ! 0%{?rhel_version}
BuildRequires : librbd-devel
%endif
%endif
%if 0%{?suse_version}
BuildRequires : libnuma-devel
%else
@ -78,7 +82,14 @@ chmod +x %{_sourcedir}/configure-hypervisor.sh
%build
export LANG=C
eval "%{_sourcedir}/configure-hypervisor.sh" "qemu-vanilla" | xargs ./configure --prefix=/usr
# RHEL in OBS does not provide librados.
# Remove it: See https://github.com/kata-containers/packaging/issues/36
"%{_sourcedir}/configure-hypervisor.sh" "qemu-vanilla" \
%if 0%{?rhel_version}
| sed -e 's/--enable-rbd//g' \
%endif
| xargs ./configure --prefix=/usr
make V=1 %{?_smp_mflags}
%install