openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package qemu (Revision 43f43f0d2213bd3518f7c8e66fcf5581)

Currently displaying revision 43f43f0d2213bd3518f7c8e66fcf5581 , Show latest

--- qemu.spec.orig
+++ qemu.spec
@@ -31,7 +31,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
@@ -94,9 +94,11 @@
 %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%( pkg-config --exists 'udev > 190' && echo '1' ) == 01
 %define _udevrulesdir /usr/lib/udev/rules.d
@@ -205,6 +207,9 @@ Patch1500:      skiboot-hdata-i2c.c-fix-
 
 # ui/keycodemapdb (Currently no patches)
 
+Patch9989:      centos7-aarch-defs.patch
+Patch9990:      centos-disable-ipxe-virtio.patch
+
 ExcludeArch:    s390
 %if "%{name}" == "qemu-testsuite"
 ExcludeArch:    s390x
@@ -238,7 +243,11 @@ BuildRequires:  glib2-devel
 %if 0%{?with_glusterfs}
 BuildRequires:  glusterfs-devel
 %endif
+%if 0%{?suse_version} || 0%{?centos_version} >= 700
 BuildRequires:  gtk3-devel
+%else
+BuildRequires:  gtk2-devel
+%endif
 BuildRequires:  libaio-devel
 BuildRequires:  libattr-devel
 BuildRequires:  libbz2-devel
@@ -292,7 +301,9 @@ BuildRequires:  libpulse-devel
 %if 0%{?with_seccomp}
 BuildRequires:  libseccomp-devel
 %endif
+%if 0%{?suse_version} || 0%{?centos_version} >= 700
 BuildRequires:  libspice-server-devel
+%endif
 BuildRequires:  libssh2-devel
 BuildRequires:  libudev-devel
 BuildRequires:  libusb-1_0-devel
@@ -309,9 +320,11 @@ BuildRequires:  multipath-tools
 BuildRequires:  multipath-tools-devel
 %endif
 BuildRequires:  ncurses-devel
+%if 0%{?centos_version} == 0
 %if %{build_x86_firmware_from_source}
 BuildRequires:  ovmf-tools
 %endif
+%endif
 BuildRequires:  pkgconfig
 BuildRequires:  pwdutils
 %if 0%{?suse_version} > 1320
@@ -323,8 +336,10 @@ BuildRequires:  python-base
 BuildRequires:  rdma-core-devel
 %endif
 BuildRequires:  snappy-devel
+%if 0%{?suse_version} || 0%{?centos_version} >= 700
 BuildRequires:  spice-protocol-devel
 BuildRequires:  systemd
+%endif
 %{?systemd_requires}
 %if %{kvm_available}
 BuildRequires:  pkgconfig(udev)
@@ -372,7 +387,11 @@ BuildRequires:  qemu-ui-sdl = %{qemuver}
 %endif
 BuildRequires:  qemu-x86    = %{qemuver}
 %endif
+%if 0%{?centos_version} == 0
 Requires(pre):  shadow
+%else
+Requires(pre):  shadow-utils
+%endif
 Requires(post): coreutils
 %if %{kvm_available}
 Requires(post): acl
@@ -380,8 +399,11 @@ Requires(post): udev
 %ifarch s390x
 Requires(post): procps
 %endif
+%if 0%{?centos_version} == 0
 Recommends:     kvm_stat
 %endif
+%endif
+%if 0%{?centos_version} == 0
 Recommends:     qemu-block-curl
 Recommends:     qemu-tools
 Recommends:     qemu-ui-curses
@@ -421,6 +443,7 @@ Suggests:       qemu-lang
 %if 0%{?is_opensuse}
 Recommends:     qemu-ksm = %{qemuver}
 %endif
+%endif
 
 %define ppc_default_built_firmware {%nil}
 %if %{build_skiboot_from_source} && %{build_slof_from_source}
@@ -462,10 +485,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} \
@@ -495,8 +520,10 @@ Requires:       qemu-ipxe
 Requires:       qemu-seabios
 Requires:       qemu-sgabios
 Requires:       qemu-vgabios
+%if 0%{?centos_version} == 0
 Recommends:     ovmf
 Recommends:     qemu-ovmf-x86_64
+%endif
 
 %description x86
 QEMU provides full machine emulation and cross architecture usage. It closely
@@ -510,11 +537,17 @@ This package provides i386 and x86_64 em
 %package ppc
 Summary:        Machine emulator and virtualizer for Power architectures
 Group:          System/Emulators/PC
+<<<<<<< .mine
+Requires:       qemu = %{version}
+%if 0%{?centos_version} == 0
+=======
 Version:        %{qemuver}
 Release:        0
 Requires:       %name = %{qemuver}
+>>>>>>> .new
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
+%endif
 
 %description ppc
 QEMU provides full machine emulation and cross architecture usage. It closely
@@ -544,13 +577,19 @@ This package provides s390x emulation.
 %package arm
 Summary:        Machine emulator and virtualizer for ARM architectures
 Group:          System/Emulators/PC
+<<<<<<< .mine
+Requires:       qemu = %{version}
+%if 0%{?centos_version} == 0
+=======
 Version:        %{qemuver}
 Release:        0
 Requires:       %name = %{qemuver}
+>>>>>>> .new
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
 Recommends:     ovmf
 Recommends:     qemu-uefi-aarch64
+%endif
 
 %description arm
 QEMU provides full machine emulation and cross architecture usage. It closely
@@ -564,11 +603,17 @@ This package provides arm emulation.
 %package extra
 Summary:        Machine emulator and virtualizer for "extra" architectures
 Group:          System/Emulators/PC
+<<<<<<< .mine
+Requires:       qemu = %{version}
+%if 0%{?centos_version} == 0
+=======
 Version:        %{qemuver}
 Release:        0
 Requires:       %name = %{qemuver}
+>>>>>>> .new
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
+%endif
 
 %description extra
 QEMU provides full machine emulation and cross architecture usage. It closely
@@ -780,15 +825,23 @@ This package contains a module for SDL b
 %package tools
 Summary:        Tools for QEMU
 Group:          System/Emulators/PC
+<<<<<<< .mine
+Provides:       qemu:%_libexecdir/qemu-bridge-helper
+%if 0%{?centos_version} == 0
+=======
 Version:        %{qemuver}
 Release:        0
 Provides:       %name:%_libexecdir/qemu-bridge-helper
+>>>>>>> .new
 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
 This package contains various QEMU related tools, including a bridge helper,
@@ -797,14 +850,24 @@ a virtfs helper, ivshmem, disk utilities
 %package guest-agent
 Summary:        Guest agent for QEMU
 Group:          System/Emulators/PC
+<<<<<<< .mine
+Provides:       qemu:%_bindir/qemu-ga
+%if 0%{?centos_version} == 0
+=======
 Version:        %{qemuver}
 Release:        0
 Provides:       %name:%_bindir/qemu-ga
+>>>>>>> .new
 Requires(pre):  shadow
+%else
+Requires(pre):  shadow-utils
+%endif
 Requires(post): udev
+%if 0%{?centos_version} == 0
 Supplements:    modalias(acpi*:QEMU0002%3A*)
 Supplements:    modalias(pci:v0000FFFDd00000101sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00005853d00000001sv*sd*bc*sc*i*)
+%endif
 %{?systemd_requires}
 
 %description guest-agent
@@ -934,7 +997,7 @@ popd
 
 pushd roms/ipxe
 %patch1200 -p1
-%if 0%{?suse_version} <= 1320
+%if 0%{?centos_version} == 0 && 0%{?suse_version} <= 1320
 %patch1201 -p1
 %endif
 %patch1202 -p1
@@ -955,6 +1018,13 @@ popd
 pushd ui/keycodemapdb
 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
@@ -962,6 +1032,15 @@ do
 done
 
 %build
+<<<<<<< .mine
+%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
+=======
+>>>>>>> .new
 ./configure \
 	--prefix=%_prefix \
 	--sysconfdir=%_sysconfdir \
@@ -977,18 +1056,24 @@ done
 %endif
 	--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 oss" \
+%else
 %if 0%{?is_opensuse}
 	--audio-drv-list="pa alsa sdl oss" \
 %else
 	--audio-drv-list="pa alsa oss" \
 %endif
+%endif
 	--enable-attr \
 	--enable-bluez \
 	--enable-brlapi \
@@ -1008,7 +1093,9 @@ done
 %endif
 	--enable-gnutls \
 	--enable-gtk \
+%if 0%{?suse_version} >= 1220 || 0%{?centos_version} >= 700
 	--with-gtkabi=3.0 \
+%endif
 	--disable-hax \
 	--disable-hvf \
 	--disable-jemalloc \
@@ -1024,12 +1111,16 @@ done
 %endif
 	--disable-libnfs \
 	--enable-libssh2 \
+%if 0%{?centos_version} >= 700
 	--enable-libusb \
+%endif
 	--disable-libxml2 \
 	--enable-linux-aio \
 	--enable-lzo \
 	--disable-malloc-trim \
+%if 0%{?centos_version} == 0
 	--enable-membarrier \
+%endif
 %if 0%{?suse_version} > 1320
 	--enable-mpath \
 %else
@@ -1094,11 +1185,19 @@ done
 	--disable-smartcard \
 %endif
 	--enable-snappy \
+%if 0%{?suse_version} || 0%{?centos_version} >= 700
 	--enable-spice \
+%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
 	--disable-vhost-crypto \
 	--enable-vhost-net \
 %if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
@@ -1115,6 +1214,7 @@ done
 	--enable-vte \
 %endif
 	--disable-whpx \
+%if 0%{?centos_version} == 0
 %ifarch x86_64
 	--enable-xen \
 	--enable-xen-pci-passthrough \
@@ -1122,7 +1222,12 @@ done
 %else
 	--disable-xen \
 %endif
+%endif
+%if 0%{?centos_version} == 600
+	--disable-xfsctl \
+%else
 	--enable-xfsctl \
+%endif
 
 %if "%{name}" != "qemu-testsuite"
 
@@ -1642,7 +1747,9 @@ fi
 %_datadir/%name/pxe-ne2k_pci.rom
 %_datadir/%name/pxe-pcnet.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 43f43f0d2213bd3518f7c8e66fcf5581)

Places