rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 295322 from home:a_faerber:branches:Virtualization

Browse Source 
Avoid libseccomp breakage on armv7l by disabling it there

OBS-URL: https://build.opensuse.org/request/show/295322
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=247
This commit is contained in:
Andreas Färber 2015-04-10 15:01:16 +00:00 committed by Git OBS Bridge
parent 9d07ea8990
commit 65a7ecc36c
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 10 08:59:34 UTC 2015 - afaerber@suse.de
- Suppress seccomp for Factory armv7l (broken in libseccomp v2.2.0)
- Disable glusterfs explicitly on Factory, SLE12 and before 13.1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 9 15:13:44 UTC 2015 - afaerber@suse.de Thu Apr 9 15:13:44 UTC 2015 - afaerber@suse.de

10
qemu.spec
View File

@ -126,7 +126,7 @@ BuildRequires: e2fsprogs-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glib2-devel BuildRequires: glib2-devel
%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
BuildRequires: glusterfs-devel BuildRequires: glusterfs-devel
%endif %endif
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
@ -620,6 +620,8 @@ done
--enable-fdt \ --enable-fdt \
%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320
--enable-glusterfs \ --enable-glusterfs \
%else
--disable-glusterfs \
%endif %endif
--enable-gtk \ --enable-gtk \
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
@ -661,10 +663,14 @@ done
%endif %endif
--enable-sdl \ --enable-sdl \
--with-sdlabi=1.2 \ --with-sdlabi=1.2 \
%ifnarch ppc64le %ifnarch ppc64le %arm
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
--enable-seccomp \ --enable-seccomp \
%else
--disable-seccomp \
%endif %endif
%else
--disable-seccomp \
%endif %endif
--enable-smartcard-nss \ --enable-smartcard-nss \
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310

10
qemu.spec.in
View File

@ -89,7 +89,7 @@ BuildRequires: e2fsprogs-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glib2-devel BuildRequires: glib2-devel
%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
BuildRequires: glusterfs-devel BuildRequires: glusterfs-devel
%endif %endif
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
@ -546,6 +546,8 @@ done
--enable-fdt \ --enable-fdt \
%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320
--enable-glusterfs \ --enable-glusterfs \
%else
--disable-glusterfs \
%endif %endif
--enable-gtk \ --enable-gtk \
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
@ -587,10 +589,14 @@ done
%endif %endif
--enable-sdl \ --enable-sdl \
--with-sdlabi=1.2 \ --with-sdlabi=1.2 \
%ifnarch ppc64le %ifnarch ppc64le %arm
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
--enable-seccomp \ --enable-seccomp \
%else
--disable-seccomp \
%endif %endif
%else
--disable-seccomp \
%endif %endif
--enable-smartcard-nss \ --enable-smartcard-nss \
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310