[xen] xen support is in 256k seabios binary when it exists
myoung
myoung at fedoraproject.org
Tue Sep 30 18:48:50 UTC 2014
commit 0645ea4ffdd75e825ac6920e14ac5ce3d1b34960
Author: Michael Young <m.a.young at durham.ac.uk>
Date: Tue Sep 30 19:48:25 2014 +0100
xen support is in 256k seabios binary when it exists
xen.spec | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/xen.spec b/xen.spec
index 2c056d2..cd1dfd8 100644
--- a/xen.spec
+++ b/xen.spec
@@ -53,7 +53,7 @@
Summary: Xen is a virtual machine monitor
Name: xen
Version: 4.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: Development/Libraries
License: GPLv2+ and LGPLv2+ and BSD
URL: http://xen.org/
@@ -314,10 +314,15 @@ mkdir -p dist/install/boot/efi/efi/fedora
%if %build_xend
%define xend_opt --enable-xend
%endif
+%if %(test -f /usr/share/seabios/bios-256k.bin && echo 1|| echo 0)
+%define seabiosloc /usr/share/seabios/bios-256k.bin
+%else
+%define seabiosloc /usr/share/seabios/bios.bin
+%endif
export XEN_VENDORVERSION="-%{release}"
export CFLAGS="$RPM_OPT_FLAGS"
make %{?_smp_mflags} %{?efi_flags} prefix=/usr dist-xen
-./configure --libdir=%{_libdir} --with-system-seabios=/usr/share/seabios/bios.bin --with-system-qemu=/usr/bin/qemu-system-i386 %{?xend_opt}
+./configure --libdir=%{_libdir} --with-system-seabios=%{seabiosloc} --with-system-qemu=/usr/bin/qemu-system-i386 %{?xend_opt}
make %{?_smp_mflags} %{?ocaml_flags} prefix=/usr dist-tools
make prefix=/usr dist-docs
unset CFLAGS
@@ -892,6 +897,9 @@ rm -rf %{buildroot}
%endif
%changelog
+* Tue Sep 30 2014 Michael Young <m.a.young at durham.ac.uk> - 4.4.1-5
+- xen support is in 256k seabios binary when it exists (#1146260)
+
* Tue Sep 23 2014 Michael Young <m.a.young at durham.ac.uk> - 4.4.1-4
- Race condition in HVMOP_track_dirty_vram [XSA-104, CVE-2014-7154] (#1145736)
- Missing privilege level checks in x86 HLT, LGDT, LIDT, and LMSW emulation
More information about the scm-commits
mailing list