openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package qemu (Revision 4ee0ef2ee16e1855188f9baad8eb3342)

Currently displaying revision 4ee0ef2ee16e1855188f9baad8eb3342 , Show latest

--- qemu.spec.orig
+++ qemu.spec
@@ -32,7 +32,7 @@
 
 %ifarch %ix86 x86_64
 # choice of building all from source or using provided binary x86 blobs
-%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
+%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) || 0%{?centos_version} >= 600
 %define build_x86_firmware_from_source 1
 %endif
 %endif
@@ -55,7 +55,7 @@
 %define legacy_qemu_kvm 1
 %endif
 
-%if 0%{?suse_version} >= 1210
+%if 0%{?suse_version} >= 1210 || 0%{?centos_version} >= 700
 %define with_systemd 1
 %endif
 
@@ -93,17 +93,21 @@
 %define with_seccomp 1
 %endif
 
+%if 0%{?centos_version} != 600
 %ifarch %ix86 x86_64 s390x aarch64 ppc64le
 %define with_seccomp 1
 %endif
+%endif
 
 %if 0%{?suse_version} >= 1140
 %define with_spice 1
 %else
+%if 0%{?centos_version} >= 700
 %ifarch %ix86 x86_64
 %define with_spice 1
 %endif
 %endif
+%endif
 
 %if 0%( pkg-config --exists 'udev > 190' && echo '1' ) == 01
 %define _udevrulesdir /usr/lib/udev/rules.d
@@ -193,6 +197,9 @@ Patch1200:      sgabios-stable-buildid.p
 
 # SLOF (Currently no patches)
 
+Patch9989:      centos7-aarch-defs.patch
+Patch9990:      centos-disable-ipxe-virtio.patch
+
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
 Source301:      ipxe-stub-out-the-SAN-req-s-in-int13.patch
@@ -230,7 +237,7 @@ BuildRequires:  glib2-devel
 %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
 BuildRequires:  glusterfs-devel
 %endif
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1220 || 0%{?centos_version} >= 700
 BuildRequires:  gtk3-devel
 %else
 BuildRequires:  gtk2-devel
@@ -315,9 +322,11 @@ BuildRequires:  makeinfo
 %endif
 BuildRequires:  Mesa-devel
 BuildRequires:  ncurses-devel
+%if 0%{?centos_version} == 0
 %if %{build_x86_firmware_from_source}
 BuildRequires:  ovmf-tools
 %endif
+%endif
 BuildRequires:  pkgconfig
 BuildRequires:  pwdutils
 BuildRequires:  python
@@ -380,7 +389,11 @@ BuildRequires:  qemu-block-rbd = %versio
 BuildRequires:  qemu-block-ssh = %version
 %endif
 %endif
+%if 0%{?centos_version} == 0
 Requires(pre):  shadow
+%else
+Requires(pre):  shadow-utils
+%endif
 Requires(post): coreutils
 %if %{kvm_available}
 Requires(post): acl
@@ -388,12 +401,15 @@ Requires(post): udev
 %ifarch s390x
 Requires(post): procps
 %endif
+%if 0%{?centos_version} == 0
 %if 0%{?suse_version} > 1320
 Recommends:     kvm_stat
 %else
 Recommends:     python-curses
 %endif
 %endif
+%endif
+%if 0%{?centos_version} == 0
 Recommends:     qemu-block-curl
 Recommends:     qemu-tools
 Recommends:     qemu-x86
@@ -430,6 +446,7 @@ Suggests:       qemu-lang
 %if 0%{?with_systemd} && 0%{?is_opensuse}
 Recommends:     qemu-ksm = %{version}
 %endif
+%endif
 
 %if %{build_slof_from_source}
 %define ppc_default_built_firmware {%nil}
@@ -464,10 +481,12 @@ efi-vmxnet3.rom}
 
 %if %{build_x86_firmware_from_source}
 %define x86_extra_built_firmware %{x86_extra_built_firmware_list}
+%if 0%{?centos_version} == 0
 %ifarch x86_64
 %define x86_64_only_extra_built_firmware %{x86_64_only_extra_built_firmware_list}
 %endif
 %endif
+%endif
 
 %define built_firmware { \
 %{?ppc_default_built_firmware} %{?ppc_extra_built_firmware} \
@@ -509,8 +528,10 @@ This sub-package provides i386 and x86_6
 Summary:        Universal CPU emulator -- Power Architecture
 Group:          System/Emulators/PC
 Requires:       qemu = %version
+%if 0%{?centos_version} == 0
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
+%endif
 
 %description ppc
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -539,10 +560,12 @@ This sub-package provides s390x emulatio
 Summary:        Universal CPU emulator -- ARM
 Group:          System/Emulators/PC
 Requires:       qemu = %version
+%if 0%{?centos_version} == 0
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
 Recommends:     ovmf
 Recommends:     qemu-uefi-aarch64
+%endif
 
 %description arm
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -557,8 +580,10 @@ This sub-package provides arm emulation.
 Summary:        Universal CPU emulator -- extra architectures
 Group:          System/Emulators/PC
 Requires:       qemu = %version
+%if 0%{?centos_version} == 0
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
+%endif
 
 %description extra
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -719,12 +744,16 @@ over an SSH network connection from qemu
 Summary:        Universal CPU emulator -- Tools
 Group:          System/Emulators/PC
 Provides:       qemu:%_libexecdir/qemu-bridge-helper
+%if 0%{?centos_version} == 0
 Requires(pre):  permissions
 Requires(pre):  shadow
 Recommends:     qemu-block-curl
 %if 0%{?with_rbd}
 Recommends:     qemu-block-rbd
 %endif
+%else
+Requires(pre):  shadow-utils
+%endif
 
 %description tools
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -739,7 +768,11 @@ This sub-package contains various tools,
 Summary:        Universal CPU emulator -- Guest agent
 Group:          System/Emulators/PC
 Provides:       qemu:%_bindir/qemu-ga
+%if 0%{?centos_version} == 0
 Requires(pre):  shadow
+%else
+Requires(pre):  shadow-utils
+%endif
 Requires(post): udev
 %if 0%{?with_systemd}
 %{?systemd_requires}
@@ -872,7 +905,7 @@ This package provides a service file for
 
 pushd roms/ipxe
 %patch1100 -p1
-%if 0%{?suse_version} <= 1320
+%if 0%{?centos_version} == 0 && 0%{?suse_version} <= 1320
 %patch1101 -p1
 %endif
 popd
@@ -884,6 +917,13 @@ popd
 pushd roms/SLOF
 popd
 
+%if 0%{?centos_version} == 700
+%patch9989 -p1
+%endif
+%if 0%{?centos_version} >= 600
+%patch9990 -p1
+%endif
+
 # as a safeguard, delete the firmware files that we intend to build
 for i in %built_firmware
 do
@@ -891,6 +931,11 @@ do
 done
 
 %build
+%if %{build_x86_firmware_from_source} && 0%{?centos_version} == 600
+echo CONFIG_ESP_SCSI=n >> roms/config.seabios-128k
+echo CONFIG_LSI_SCSI=n >> roms/config.seabios-128k
+echo CONFIG_MEGASAS=n >> roms/config.seabios-128k
+%endif
 echo '%{version}' > roms/seabios/.version
 ./configure \
 	--prefix=%_prefix \
@@ -901,14 +946,20 @@ echo '%{version}' > roms/seabios/.versio
 	--docdir=%_docdir/qemu \
 	--extra-cflags="%{optflags}" \
 	--disable-stack-protector \
+%if 0%{?centos_version} == 0
 	--disable-strip \
+%endif
 	--with-pkgversion="%(echo '%{distro}' | sed 's/ (.*)//')" \
 	--enable-system --disable-linux-user \
 	--enable-tools --enable-guest-agent \
 	--enable-modules \
 	--enable-pie \
 	--enable-docs \
+%if 0%{?centos_version} == 600
+	--audio-drv-list="alsa sdl oss" \
+%else
 	--audio-drv-list="pa alsa sdl oss" \
+%endif
 	--enable-attr \
 	--enable-bluez \
 %if 0%{?suse_version} >= 1130
@@ -934,7 +985,7 @@ echo '%{version}' > roms/seabios/.versio
 %endif
 	--enable-gnutls \
 	--enable-gtk \
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1220 || 0%{?centos_version} >= 700
 	--with-gtkabi=3.0 \
 %else
 	--with-gtkabi=2.0 \
@@ -1029,8 +1080,14 @@ echo '%{version}' > roms/seabios/.versio
 %endif
 	--disable-tcmalloc \
 	--enable-tpm \
+%if 0%{?centos_version} == 600
+	--disable-usb-redir \
+%else
 	--enable-usb-redir \
+%endif
+%if 0%{?centos_version} == 0
 	--enable-vde \
+%endif
 	--enable-vhost-net \
 %if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
 	--enable-virglrenderer \
@@ -1045,6 +1102,7 @@ echo '%{version}' > roms/seabios/.versio
 %else
 	--enable-vte \
 %endif
+%if 0%{?centos_version} == 0
 %ifarch x86_64
 	--enable-xen \
 	--enable-xen-pci-passthrough \
@@ -1052,7 +1110,12 @@ echo '%{version}' > roms/seabios/.versio
 %else
 	--disable-xen \
 %endif
+%endif
+%if 0%{?centos_version} == 600
+	--disable-xfsctl \
+%else
 	--enable-xfsctl \
+%endif
 
 %if "%{name}" != "qemu-testsuite"
 
@@ -1571,7 +1634,9 @@ fi
 %_datadir/%name/pxe-pcnet.rom
 %_datadir/%name/pxe-ne2k_pci.rom
 %_datadir/%name/pxe-rtl8139.rom
+%if 0%{?centos_version} == 0
 %_datadir/%name/pxe-virtio.rom
+%endif
 %_datadir/%name/efi-e1000.rom
 %_datadir/%name/efi-e1000e.rom
 %_datadir/%name/efi-eepro100.rom

Places

File project.diff of Package qemu (Revision 4ee0ef2ee16e1855188f9baad8eb3342)

Places