pool/qemu
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 870726 from home:bfrogers:branches:Virtualization

Browse Source 
- Switch the modules qemu-ui-display-gpu and qemu-ui-display-gpu-pci
  from being an x86 only Recommends, to a Recommends for all arch's
  except s390x (boo#1181350)
- Fix qemu-hw-usb-smartcard to not be a Recommends for s390x
- Minor spec file tweaks for compatibility with upcoming spec file
  formatter
- Make note that this patch takes care of an OOB access in ARM
  interrupt handling (CVE-2021-20221 bsc#1181933)
  hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch

OBS-URL: https://build.opensuse.org/request/show/870726
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=615
This commit is contained in:
Bruce Rogers 2021-02-10 03:00:31 +00:00 committed by Git OBS Bridge
parent a8263c0693
commit ddbbacb439
5 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch
View File

@ -6,6 +6,7 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Git-commit: edfe2eb4360cde4ed5d95bda7777edcb3510f76a
References: bsc#1181933
Per the ARM Generic Interrupt Controller Architecture specification
(document "ARM IHI 0048B.b (ID072613)"), the SGIINTID field is 4 bit,

17
qemu.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Feb 8 20:53:03 UTC 2021 - Bruce Rogers <brogers@suse.com>
- Switch the modules qemu-ui-display-gpu and qemu-ui-display-gpu-pci
from being an x86 only Recommends, to a Recommends for all arch's
except s390x (boo#1181350)
- Fix qemu-hw-usb-smartcard to not be a Recommends for s390x
- Minor spec file tweaks for compatibility with upcoming spec file
formatter
-------------------------------------------------------------------
Mon Feb 8 17:11:21 UTC 2021 - Bruce Rogers <brogers@suse.com>
- Make note that this patch takes care of an OOB access in ARM
interrupt handling (CVE-2021-20221 bsc#1181933)
hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch
-------------------------------------------------------------------
Fri Feb 5 18:54:34 UTC 2021 - Bruce Rogers <brogers@suse.com>

18
qemu.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package qemu
# spec file for package qemu%{name_suffix}
#
# Copyright (c) 2021 SUSE LLC
#
@ -367,20 +367,20 @@ Requires(post): procps
Recommends: kvm_stat
%endif
Recommends: qemu-block-curl
Recommends: qemu-hw-usb-smartcard
Recommends: qemu-ksm = %{qemuver}
Recommends: qemu-tools
Recommends: qemu-ui-curses
%ifnarch s390x
Recommends: qemu-hw-display-qxl
Recommends: qemu-hw-display-virtio-gpu
Recommends: qemu-hw-display-virtio-gpu-pci
Recommends: qemu-hw-display-virtio-vga
Recommends: qemu-hw-usb-redirect
Recommends: qemu-hw-usb-smartcard
Recommends: qemu-ui-gtk
Recommends: qemu-ui-spice-app
%endif
%ifarch %{ix86} x86_64
Recommends: qemu-hw-display-virtio-gpu
Recommends: qemu-hw-display-virtio-gpu-pci
Recommends: qemu-x86
%else
Suggests: qemu-x86
@ -483,10 +483,10 @@ Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Requires: %name = %{qemuver}
Recommends: qemu-ipxe
Recommends: qemu-vgabios
Recommends: ovmf
Recommends: qemu-ipxe
Recommends: qemu-uefi-aarch64
Recommends: qemu-vgabios
%description arm
%{generic_qemu_description}
@ -500,8 +500,8 @@ Version: %{qemuver}
Release: 0
Requires: %name = %{qemuver}
Recommends: qemu-ipxe
Recommends: qemu-vgabios
Recommends: qemu-skiboot
Recommends: qemu-vgabios
%description extra
%{generic_qemu_description}
@ -861,8 +861,8 @@ Release: 0
Requires: group(kvm)
Requires(post): udev
Supplements: modalias(acpi*:QEMU0002%3A*)
Supplements: modalias(pci:v0000FFFDd00000101sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00005853d00000001sv*sd*bc*sc*i*)
Supplements: modalias(pci:v0000FFFDd00000101sv*sd*bc*sc*i*)
%{?systemd_ordering}
%description guest-agent
@ -941,7 +941,7 @@ Version: %{qemuver}
Release: 0
BuildArch: noarch
Requires(post): update-alternatives
Requires(postun): update-alternatives
Requires(postun):update-alternatives
Provides: %name:%_datadir/%name/forsplits/06
%description skiboot

18
qemu.spec.in
View File

@ -1,5 +1,5 @@
#
# spec file for package qemu
# spec file for package qemu%{name_suffix}
#
# Copyright (c) 2021 SUSE LLC
#
@ -281,20 +281,20 @@ Requires(post): procps
Recommends: kvm_stat
%endif
Recommends: qemu-block-curl
Recommends: qemu-hw-usb-smartcard
Recommends: qemu-ksm = %{qemuver}
Recommends: qemu-tools
Recommends: qemu-ui-curses
%ifnarch s390x
Recommends: qemu-hw-display-qxl
Recommends: qemu-hw-display-virtio-gpu
Recommends: qemu-hw-display-virtio-gpu-pci
Recommends: qemu-hw-display-virtio-vga
Recommends: qemu-hw-usb-redirect
Recommends: qemu-hw-usb-smartcard
Recommends: qemu-ui-gtk
Recommends: qemu-ui-spice-app
%endif
%ifarch %{ix86} x86_64
Recommends: qemu-hw-display-virtio-gpu
Recommends: qemu-hw-display-virtio-gpu-pci
Recommends: qemu-x86
%else
Suggests: qemu-x86
@ -397,10 +397,10 @@ Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Requires: %name = %{qemuver}
Recommends: qemu-ipxe
Recommends: qemu-vgabios
Recommends: ovmf
Recommends: qemu-ipxe
Recommends: qemu-uefi-aarch64
Recommends: qemu-vgabios
%description arm
%{generic_qemu_description}
@ -414,8 +414,8 @@ Version: %{qemuver}
Release: 0
Requires: %name = %{qemuver}
Recommends: qemu-ipxe
Recommends: qemu-vgabios
Recommends: qemu-skiboot
Recommends: qemu-vgabios
%description extra
%{generic_qemu_description}
@ -775,8 +775,8 @@ Release: 0
Requires: group(kvm)
Requires(post): udev
Supplements: modalias(acpi*:QEMU0002%3A*)
Supplements: modalias(pci:v0000FFFDd00000101sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00005853d00000001sv*sd*bc*sc*i*)
Supplements: modalias(pci:v0000FFFDd00000101sv*sd*bc*sc*i*)
%{?systemd_ordering}
%description guest-agent
@ -855,7 +855,7 @@ Version: %{qemuver}
Release: 0
BuildArch: noarch
Requires(post): update-alternatives
Requires(postun): update-alternatives
Requires(postun):update-alternatives
Provides: %name:%_datadir/%name/forsplits/06
%description skiboot

1
update_git.sh
View File

@ -597,6 +597,7 @@ rm -rf $CMP_DIR
rm -rf checkdir
osc service localrun format_spec_file
sed -i 's/^# spec file for package qemu$/# spec file for package qemu%{name_suffix}/g' qemu.spec
}
#==============================================================================