pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Advertise aarch64 UEFI firmware paths

Browse Source 
- adjust spec file to include aarch64 paths in
    '--with-loader-nvram=' configure option
  - adjust qemu.conf 'nvram' option to include the SUSE paths
  bsc#981836, bsc#983747

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=541
This commit is contained in:
James Fehlig 2016-06-15 19:29:46 +00:00 committed by Git OBS Bridge
parent 09bdbb5659
commit e45054c955
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libvirt.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Jun 15 18:51:29 UTC 2016 - jfehlig@suse.com
- Advertise aarch64 UEFI firmware paths
- adjust spec file to include aarch64 paths in
'--with-loader-nvram=' configure option
- adjust qemu.conf 'nvram' option to include the SUSE paths
bsc#981836, bsc#983747
-------------------------------------------------------------------
Thu Jun 9 15:12:19 UTC 2016 - jfehlig@suse.com

10
libvirt.spec
View File

@ -109,8 +109,6 @@
%define qemu_user qemu
%define qemu_group qemu
%define arg_loader_nvram --with-loader-nvram="/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin"
# Pull in cgroups config system
%if %{with_qemu} || %{with_lxc}
%define with_cgconfig 0%{!?_without_cgconfig:1}
@ -845,6 +843,14 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%define arg_selinux_mount --with-selinux-mount="/selinux"
# x86_64 UEFI firmwares
# To more closely resemble actual hardware, we use the firmwares with
# embedded Microsoft keys
LOADERS="/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin"
# aarch64 UEFI firmwares
LOADERS="$LOADERS:/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
%define arg_loader_nvram --with-loader-nvram="$LOADERS"
autoreconf -f -i
export CFLAGS="$RPM_OPT_FLAGS"
%configure --disable-static --with-pic \

20
suse-qemu-conf.patch
View File

@ -1,3 +1,12 @@
SUSE adjustments to qemu.conf
This patch contains SUSE-specific adjustments to the upstream
qemu.conf configuration file. In the future, it might make
sense to separate these changes into individual patches (e.g.
suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch,
etc.), but for now they are all lumped together in this
single patch.
Index: libvirt-1.3.5/src/qemu/qemu.conf
===================================================================
--- libvirt-1.3.5.orig/src/qemu/qemu.conf
@ -53,3 +62,14 @@ Index: libvirt-1.3.5/src/qemu/qemu.conf
#
#lock_manager = "lockd"
@@ -512,8 +532,8 @@
# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
# follows this scheme.
#nvram = [
-# "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd",
-# "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd"
+# "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin",
+# "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
#]
# The backend to use for handling stdout/stderr output from