github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-01 17:06:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38 from jcvenegas/rhel-qemu

Browse Source 
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
parent b8bd68b77b a6d77fddaf
commit ff7349b7fe
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
qemu-lite/qemu-lite.spec-template
View File

@@ -27,12 +27,16 @@ BuildRequires : libtool
BuildRequires : m4 BuildRequires : m4
BuildRequires : findutils BuildRequires : findutils
%if 0%{?rhel_version} || 0%{?centos_version} %if 0%{?centos_version}
BuildRequires : librbd1-devel BuildRequires : librbd1-devel
%else %else
%if ! 0%{?rhel_version}
BuildRequires : librbd-devel BuildRequires : librbd-devel
%endif %endif
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires : libnuma-devel BuildRequires : libnuma-devel
%else %else
@@ -78,7 +82,14 @@ chmod +x %{_sourcedir}/configure-hypervisor.sh
%build %build
export LANG=C 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} make V=1 %{?_smp_mflags}
%install %install

15
qemu-vanilla/qemu-vanilla.spec-template
View File

@@ -27,12 +27,16 @@ BuildRequires : libtool
BuildRequires : m4 BuildRequires : m4
BuildRequires : findutils BuildRequires : findutils
%if 0%{?rhel_version} || 0%{?centos_version} %if 0%{?centos_version}
BuildRequires : librbd1-devel BuildRequires : librbd1-devel
%else %else
%if ! 0%{?rhel_version}
BuildRequires : librbd-devel BuildRequires : librbd-devel
%endif %endif
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires : libnuma-devel BuildRequires : libnuma-devel
%else %else
@@ -78,7 +82,14 @@ chmod +x %{_sourcedir}/configure-hypervisor.sh
%build %build
export LANG=C 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} make V=1 %{?_smp_mflags}
%install %install