92ed83b0e8
the toolstack instead of embedding in hvmloader http://lists.xenproject.org/archives/html/xen-devel/2016-03/msg01626.html 0001-libxc-Rework-extra-module-initialisation.patch, 0002-libxc-Prepare-a-start-info-structure-for-hvmloader.patch, 0003-configure-define-SEABIOS_PATH-and-OVMF_PATH.patch, 0004-firmware-makefile-install-BIOS-blob.patch, 0005-libxl-Load-guest-BIOS-from-file.patch, 0006-xen-Move-the-hvm_start_info-C-representation-from-li.patch, 0007-hvmloader-Grab-the-hvm_start_info-pointer.patch, 0008-hvmloader-Locate-the-BIOS-blob.patch, 0009-hvmloader-Check-modules-whereabouts-in-perform_tests.patch, 0010-hvmloader-Load-SeaBIOS-from-hvm_start_info-modules.patch, 0011-hvmloader-Load-OVMF-from-modules.patch, 0012-hvmloader-Specific-bios_load-function-required.patch, 0013-hvmloader-Always-build-in-SeaBIOS-and-OVMF-loader.patch, 0014-configure-do-not-depend-on-SEABIOS_PATH-or-OVMF_PATH.patch - Enable support for UEFI on x86_64 using the ovmf-x86_64-ms.bin firmware from qemu-ovmf-x86_64. The firmware is preloaded with Microsoft keys to more closely resemble firmware on real hardware FATE#320490 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=416
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
From d42d9e59472e2c637776245db8e80de0b907d46b Mon Sep 17 00:00:00 2001
|
|
From: Anthony PERARD <anthony.perard@citrix.com>
|
|
Date: Mon, 14 Mar 2016 17:55:49 +0000
|
|
Subject: [PATCH 14/15] configure: do not depend on SEABIOS_PATH or OVMF_PATH
|
|
...
|
|
|
|
... to compile SeaBIOS and OVMF. Only depends on CONFIG_*.
|
|
|
|
If --with-system-* configure option is used, then set *_CONFIG=n to not
|
|
compile SEABIOS and OVMF.
|
|
|
|
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
---
|
|
tools/configure.ac | 6 ++++--
|
|
tools/firmware/Makefile | 8 --------
|
|
2 files changed, 4 insertions(+), 10 deletions(-)
|
|
|
|
Index: xen-4.7.0-testing/tools/configure.ac
|
|
===================================================================
|
|
--- xen-4.7.0-testing.orig/tools/configure.ac
|
|
+++ xen-4.7.0-testing/tools/configure.ac
|
|
@@ -212,12 +212,13 @@ AC_ARG_WITH([system-seabios],
|
|
AS_HELP_STRING([--with-system-seabios@<:@=PATH@:>@],
|
|
[Use system supplied seabios PATH instead of building and installing
|
|
our own version]),[
|
|
+ # Disable compilation of SeaBIOS.
|
|
+ seabios=n
|
|
case $withval in
|
|
no) seabios_path= ;;
|
|
*) seabios_path=$withval ;;
|
|
esac
|
|
],[])
|
|
-AC_SUBST(seabios_path)
|
|
AC_DEFINE_UNQUOTED([SEABIOS_PATH],
|
|
["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"],
|
|
[SeaBIOS path])
|
|
@@ -226,12 +227,13 @@ AC_ARG_WITH([system-ovmf],
|
|
AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@],
|
|
[Use system supplied OVMF PATH instead of building and installing
|
|
our own version]),[
|
|
+ # Disable compilation of OVMF.
|
|
+ ovmf=n
|
|
case $withval in
|
|
no) ovmf_path= ;;
|
|
*) ovmf_path=$withval ;;
|
|
esac
|
|
],[])
|
|
-AC_SUBST(ovmf_path)
|
|
AC_DEFINE_UNQUOTED([OVMF_PATH],
|
|
["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"],
|
|
[OVMF path])
|
|
Index: xen-4.7.0-testing/tools/firmware/Makefile
|
|
===================================================================
|
|
--- xen-4.7.0-testing.orig/tools/firmware/Makefile
|
|
+++ xen-4.7.0-testing/tools/firmware/Makefile
|
|
@@ -6,12 +6,8 @@ TARGET := hvmloader/hvmloader
|
|
INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR)
|
|
|
|
SUBDIRS-y :=
|
|
-ifeq ($(OVMF_PATH),)
|
|
SUBDIRS-$(CONFIG_OVMF) += ovmf-dir
|
|
-endif
|
|
-ifeq ($(SEABIOS_PATH),)
|
|
SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
|
|
-endif
|
|
SUBDIRS-$(CONFIG_ROMBIOS) += rombios
|
|
SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
|
|
SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
|
|
@@ -49,15 +45,11 @@ install: all
|
|
[ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR)
|
|
[ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
|
|
ifeq ($(CONFIG_SEABIOS),y)
|
|
-ifeq ($(SEABIOS_PATH),)
|
|
$(INSTALL_DATA) $(SEABIOS_ROM) $(INST_DIR)/seabios.bin
|
|
endif
|
|
-endif
|
|
ifeq ($(CONFIG_OVMF),y)
|
|
-ifeq ($(OVMF_PATH),)
|
|
$(INSTALL_DATA) $(OVMF_ROM) $(INST_DIR)/ovmf.bin
|
|
endif
|
|
-endif
|
|
|
|
.PHONY: clean
|
|
clean: subdirs-clean
|