Accepting request 834747 from home:bfrogers:branches:Virtualization
- Change qemu-x86 packaging relationship with qemu-microvm from Requires to Recommends (Also get rid of two is_opensuse references which came from patch processing of Include-If directives) OBS-URL: https://build.opensuse.org/request/show/834747 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=573
This commit is contained in:
parent
a39f56d271
commit
fdc02fac50
@ -4,7 +4,6 @@ Subject: [build] Workaround compilation error with gcc 9.1
|
||||
|
||||
Git-commit: 1dd56dbd11082fb622c2ed21cfaced4f47d798a6
|
||||
References: bsc#1121464
|
||||
Include-If: %if 0%{?suse_version} > 1500 && 0%{?is_opensuse}
|
||||
|
||||
Compiling with gcc 9.1 generates lots of "taking address of packed
|
||||
member of ... may result in an unaligned pointer value" warnings.
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cd3bfd521435e18a39b881d92d0d740094e3729e98b18158a260a94cb184fd0d
|
||||
size 34852
|
||||
oid sha256:4792dc5d50579b8c3d4456e1720063243cab5e6a30f98d6bff362f02c8cff873
|
||||
size 35216
|
||||
|
@ -2,7 +2,7 @@ From: Bruce Rogers <brogers@suse.com>
|
||||
Date: Tue, 28 Apr 2020 09:53:49 -0600
|
||||
Subject: docs: add SUSE support statements to html docs
|
||||
|
||||
Include-If: %if %{legacy_qemu_kvm} && 0%{?is_opensuse} == 0
|
||||
Include-If: %if %{legacy_qemu_kvm}
|
||||
|
||||
We can fairly easily produce an html version of our support statements.
|
||||
Now that qemu includes fairly good html-based documentation, leverage it
|
||||
|
@ -1,10 +1,27 @@
|
||||
From: Jon Doron <arilou@gmail.com>
|
||||
Date: Wed, 15 Jul 2020 11:43:26 +0300
|
||||
Subject: hw: hyperv: vmbus: Fix 32bit compilation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Git-commit: 0000000000000000000000000000000000000000
|
||||
Git-commit: 8b39aa90e90e9c04d07b0fbb583195237f3f11fe
|
||||
|
||||
Fix 32-bit build error for vmbus:
|
||||
|
||||
hw/hyperv/vmbus.c: In function ‘gpadl_iter_io’:
|
||||
hw/hyperv/vmbus.c:383:13: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
|
||||
383 | p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | off_in_page);
|
||||
| ^
|
||||
cc1: all warnings being treated as errors
|
||||
|
||||
Fixes: 0d71f7082d7 ("vmbus: vmbus implementation")
|
||||
Signed-off-by: Jon Doron <arilou@gmail.com>
|
||||
Tested-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
|
||||
Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
|
||||
Message-Id: <20200715084326.678715-3-arilou@gmail.com>
|
||||
[lv: updated with commit description from <20200906050113.2783642-1-richard.henderson@linaro.org>]
|
||||
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
||||
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||||
---
|
||||
hw/hyperv/vmbus.c | 3 ++-
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 15 21:19:55 UTC 2020 - Bruce Rogers <brogers@suse.com>
|
||||
|
||||
- Change qemu-x86 packaging relationship with qemu-microvm from
|
||||
Requires to Recommends
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 10 21:42:02 UTC 2020 - Bruce Rogers <brogers@suse.com>
|
||||
|
||||
|
10
qemu.spec
10
qemu.spec
@ -455,11 +455,11 @@ Version: %{qemuver}
|
||||
Release: 0
|
||||
Requires: %name = %{qemuver}
|
||||
Requires: qemu-ipxe
|
||||
Requires: qemu-microvm
|
||||
Requires: qemu-seabios
|
||||
Requires: qemu-sgabios
|
||||
Requires: qemu-vgabios
|
||||
Recommends: ovmf
|
||||
Recommends: qemu-microvm
|
||||
Recommends: qemu-ovmf-x86_64
|
||||
|
||||
%description x86
|
||||
@ -814,14 +814,14 @@ to provide information and control at the guest OS level.
|
||||
|
||||
%ifarch %{build_rom_arch}
|
||||
%package microvm
|
||||
Summary: x86 MicroVM BIOS for QEMU
|
||||
Summary: x86 MicroVM firmware for QEMU
|
||||
Group: System/Emulators/PC
|
||||
Version: %{qemuver}
|
||||
Release: 0
|
||||
BuildArch: noarch
|
||||
|
||||
%description microvm
|
||||
MicroVM (qboot) is a miniam x86 firmware for booting Linux kernel.
|
||||
MicroVM (qboot) is a minimal x86 firmware for booting Linux kernel.
|
||||
It provides the minimum resources needed to boot PVH and bzImages.
|
||||
|
||||
%package seabios
|
||||
@ -952,7 +952,7 @@ This package provides a service file for starting and stopping KSM.
|
||||
%patch00040 -p1
|
||||
%patch00041 -p1
|
||||
%patch00042 -p1
|
||||
%if %{legacy_qemu_kvm} && 0%{?is_opensuse} == 0
|
||||
%if %{legacy_qemu_kvm}
|
||||
%patch00043 -p1
|
||||
%endif
|
||||
%patch00044 -p1
|
||||
@ -962,9 +962,7 @@ This package provides a service file for starting and stopping KSM.
|
||||
%patch01001 -p1
|
||||
%patch01002 -p1
|
||||
%patch02000 -p1
|
||||
%if 0%{?suse_version} > 1500 && 0%{?is_opensuse}
|
||||
%patch02001 -p1
|
||||
%endif
|
||||
%patch02002 -p1
|
||||
%patch02003 -p1
|
||||
%patch02004 -p1
|
||||
|
@ -383,11 +383,11 @@ Version: %{qemuver}
|
||||
Release: 0
|
||||
Requires: %name = %{qemuver}
|
||||
Requires: qemu-ipxe
|
||||
Requires: qemu-microvm
|
||||
Requires: qemu-seabios
|
||||
Requires: qemu-sgabios
|
||||
Requires: qemu-vgabios
|
||||
Recommends: ovmf
|
||||
Recommends: qemu-microvm
|
||||
Recommends: qemu-ovmf-x86_64
|
||||
|
||||
%description x86
|
||||
@ -742,14 +742,14 @@ to provide information and control at the guest OS level.
|
||||
|
||||
%ifarch %{build_rom_arch}
|
||||
%package microvm
|
||||
Summary: x86 MicroVM BIOS for QEMU
|
||||
Summary: x86 MicroVM firmware for QEMU
|
||||
Group: System/Emulators/PC
|
||||
Version: %{qemuver}
|
||||
Release: 0
|
||||
BuildArch: noarch
|
||||
|
||||
%description microvm
|
||||
MicroVM (qboot) is a miniam x86 firmware for booting Linux kernel.
|
||||
MicroVM (qboot) is a minimal x86 firmware for booting Linux kernel.
|
||||
It provides the minimum resources needed to boot PVH and bzImages.
|
||||
|
||||
%package seabios
|
||||
|
Loading…
Reference in New Issue
Block a user