Accepting request 391999 from home:a_faerber:branches:Virtualization
Enable libiscsi support and enable seccomp support for ppc64le OBS-URL: https://build.opensuse.org/request/show/391999 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=292
This commit is contained in:
Andreas Färber
Git OBS Bridge
parent
49359e0184
commit
aa1bf9092e
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 28 15:21:54 UTC 2016 - afaerber@suse.de
|
||||
|
||||
- Bump copyright in qemu-linux-user.spec.in
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 22 16:37:37 UTC 2016 - afaerber@suse.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package qemu-linux-user
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 28 15:12:18 UTC 2016 - afaerber@suse.de
|
||||
|
||||
- Bump copyright in qemu.spec.in
|
||||
- Enable libiscsi for Factory
|
||||
- Enable seccomp for ppc64le as well
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 22 16:37:33 UTC 2016 - afaerber@suse.de
|
||||
|
||||
|
||||
@ -160,6 +160,9 @@ BuildRequires: libgnutls-devel
|
||||
%if 0%{?suse_version} >= 1315
|
||||
BuildRequires: libibverbs-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: libiscsi-devel
|
||||
%endif
|
||||
BuildRequires: libjpeg-devel
|
||||
%if 0%{?suse_version} >= 1310
|
||||
BuildRequires: libnettle-devel
|
||||
@ -180,11 +183,9 @@ BuildRequires: libpulse-devel
|
||||
%if 0%{?suse_version} >= 1315
|
||||
BuildRequires: librdmacm-devel
|
||||
%endif
|
||||
%ifnarch ppc64le
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: libseccomp-devel
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1140
|
||||
BuildRequires: libssh2-devel
|
||||
%endif
|
||||
@ -464,6 +465,23 @@ This sub-package contains a module for accessing network-based image files
|
||||
over a GlusterFS network connection from qemu-img tool and QEMU system emulation.
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1320
|
||||
%package block-iscsi
|
||||
Summary: Universal CPU emulator -- iSCSI block support
|
||||
Group: System/Emulators/PC
|
||||
%{qemu_module_conflicts}
|
||||
|
||||
%description block-iscsi
|
||||
QEMU is an extremely well-performing CPU emulator that allows you to
|
||||
choose between simulating an entire system and running userspace
|
||||
binaries for different architectures under your native operating
|
||||
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
|
||||
as PC and PowerMac systems.
|
||||
|
||||
This sub-package contains a module for accessing network-based image files
|
||||
over an iSCSI network connection from qemu-img tool and QEMU system emulation.
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1140
|
||||
%package block-ssh
|
||||
Summary: Universal CPU emulator -- SSH block support
|
||||
@ -700,7 +718,11 @@ rm -f pc-bios/slof.bin
|
||||
%else
|
||||
--disable-kvm \
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320
|
||||
--enable-libiscsi \
|
||||
%else
|
||||
--disable-libiscsi \
|
||||
%endif
|
||||
--disable-libnfs \
|
||||
%if 0%{?suse_version} > 1140
|
||||
--enable-libssh2 \
|
||||
@ -736,12 +758,8 @@ rm -f pc-bios/slof.bin
|
||||
%endif
|
||||
--enable-sdl \
|
||||
--with-sdlabi=1.2 \
|
||||
%ifnarch ppc64le
|
||||
%if 0%{?suse_version} > 1320
|
||||
--enable-seccomp \
|
||||
%else
|
||||
--disable-seccomp \
|
||||
%endif
|
||||
%else
|
||||
--disable-seccomp \
|
||||
%endif
|
||||
@ -1090,6 +1108,12 @@ fi
|
||||
%_libdir/%name/block-gluster.so
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1320
|
||||
%files block-iscsi
|
||||
%defattr(-, root, root)
|
||||
%_libdir/%name/block-iscsi.so
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1140
|
||||
%files block-ssh
|
||||
%defattr(-, root, root)
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 28 15:12:18 UTC 2016 - afaerber@suse.de
|
||||
|
||||
- Bump copyright in qemu.spec.in
|
||||
- Enable libiscsi for Factory
|
||||
- Enable seccomp for ppc64le as well
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 22 16:37:33 UTC 2016 - afaerber@suse.de
|
||||
|
||||
|
||||
36
qemu.spec
36
qemu.spec
@ -160,6 +160,9 @@ BuildRequires: libgnutls-devel
|
||||
%if 0%{?suse_version} >= 1315
|
||||
BuildRequires: libibverbs-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: libiscsi-devel
|
||||
%endif
|
||||
BuildRequires: libjpeg-devel
|
||||
%if 0%{?suse_version} >= 1310
|
||||
BuildRequires: libnettle-devel
|
||||
@ -180,11 +183,9 @@ BuildRequires: libpulse-devel
|
||||
%if 0%{?suse_version} >= 1315
|
||||
BuildRequires: librdmacm-devel
|
||||
%endif
|
||||
%ifnarch ppc64le
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: libseccomp-devel
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1140
|
||||
BuildRequires: libssh2-devel
|
||||
%endif
|
||||
@ -464,6 +465,23 @@ This sub-package contains a module for accessing network-based image files
|
||||
over a GlusterFS network connection from qemu-img tool and QEMU system emulation.
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1320
|
||||
%package block-iscsi
|
||||
Summary: Universal CPU emulator -- iSCSI block support
|
||||
Group: System/Emulators/PC
|
||||
%{qemu_module_conflicts}
|
||||
|
||||
%description block-iscsi
|
||||
QEMU is an extremely well-performing CPU emulator that allows you to
|
||||
choose between simulating an entire system and running userspace
|
||||
binaries for different architectures under your native operating
|
||||
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
|
||||
as PC and PowerMac systems.
|
||||
|
||||
This sub-package contains a module for accessing network-based image files
|
||||
over an iSCSI network connection from qemu-img tool and QEMU system emulation.
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1140
|
||||
%package block-ssh
|
||||
Summary: Universal CPU emulator -- SSH block support
|
||||
@ -700,7 +718,11 @@ rm -f pc-bios/slof.bin
|
||||
%else
|
||||
--disable-kvm \
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320
|
||||
--enable-libiscsi \
|
||||
%else
|
||||
--disable-libiscsi \
|
||||
%endif
|
||||
--disable-libnfs \
|
||||
%if 0%{?suse_version} > 1140
|
||||
--enable-libssh2 \
|
||||
@ -736,12 +758,8 @@ rm -f pc-bios/slof.bin
|
||||
%endif
|
||||
--enable-sdl \
|
||||
--with-sdlabi=1.2 \
|
||||
%ifnarch ppc64le
|
||||
%if 0%{?suse_version} > 1320
|
||||
--enable-seccomp \
|
||||
%else
|
||||
--disable-seccomp \
|
||||
%endif
|
||||
%else
|
||||
--disable-seccomp \
|
||||
%endif
|
||||
@ -1090,6 +1108,12 @@ fi
|
||||
%_libdir/%name/block-gluster.so
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1320
|
||||
%files block-iscsi
|
||||
%defattr(-, root, root)
|
||||
%_libdir/%name/block-iscsi.so
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1140
|
||||
%files block-ssh
|
||||
%defattr(-, root, root)
|
||||
|
||||
38
qemu.spec.in
38
qemu.spec.in
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package qemu
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -120,6 +120,9 @@ BuildRequires: libgnutls-devel
|
||||
%if 0%{?suse_version} >= 1315
|
||||
BuildRequires: libibverbs-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: libiscsi-devel
|
||||
%endif
|
||||
BuildRequires: libjpeg-devel
|
||||
%if 0%{?suse_version} >= 1310
|
||||
BuildRequires: libnettle-devel
|
||||
@ -140,11 +143,9 @@ BuildRequires: libpulse-devel
|
||||
%if 0%{?suse_version} >= 1315
|
||||
BuildRequires: librdmacm-devel
|
||||
%endif
|
||||
%ifnarch ppc64le
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: libseccomp-devel
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1140
|
||||
BuildRequires: libssh2-devel
|
||||
%endif
|
||||
@ -424,6 +425,23 @@ This sub-package contains a module for accessing network-based image files
|
||||
over a GlusterFS network connection from qemu-img tool and QEMU system emulation.
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1320
|
||||
%package block-iscsi
|
||||
Summary: Universal CPU emulator -- iSCSI block support
|
||||
Group: System/Emulators/PC
|
||||
%{qemu_module_conflicts}
|
||||
|
||||
%description block-iscsi
|
||||
QEMU is an extremely well-performing CPU emulator that allows you to
|
||||
choose between simulating an entire system and running userspace
|
||||
binaries for different architectures under your native operating
|
||||
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
|
||||
as PC and PowerMac systems.
|
||||
|
||||
This sub-package contains a module for accessing network-based image files
|
||||
over an iSCSI network connection from qemu-img tool and QEMU system emulation.
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1140
|
||||
%package block-ssh
|
||||
Summary: Universal CPU emulator -- SSH block support
|
||||
@ -620,7 +638,11 @@ rm -f pc-bios/slof.bin
|
||||
%else
|
||||
--disable-kvm \
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320
|
||||
--enable-libiscsi \
|
||||
%else
|
||||
--disable-libiscsi \
|
||||
%endif
|
||||
--disable-libnfs \
|
||||
%if 0%{?suse_version} > 1140
|
||||
--enable-libssh2 \
|
||||
@ -656,12 +678,8 @@ rm -f pc-bios/slof.bin
|
||||
%endif
|
||||
--enable-sdl \
|
||||
--with-sdlabi=1.2 \
|
||||
%ifnarch ppc64le
|
||||
%if 0%{?suse_version} > 1320
|
||||
--enable-seccomp \
|
||||
%else
|
||||
--disable-seccomp \
|
||||
%endif
|
||||
%else
|
||||
--disable-seccomp \
|
||||
%endif
|
||||
@ -1011,6 +1029,12 @@ fi
|
||||
%_libdir/%name/block-gluster.so
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1320
|
||||
%files block-iscsi
|
||||
%defattr(-, root, root)
|
||||
%_libdir/%name/block-iscsi.so
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1140
|
||||
%files block-ssh
|
||||
%defattr(-, root, root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user