From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Tue, 21 Apr 2015 16:04:19 +0000 (+0000)
Subject: raisin: introduce ovmf
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6384b7ea68da6c4d2e28f63ce3e7de3193f46933;p=raisin.git

raisin: introduce ovmf

Add a component to build ovmf and pass the output binary to the xen
build.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

---

Changes in v2:

- only enable ovmf in Xen, if we actually have built ovmf.
---

diff --git a/components/series b/components/series
index f0f3cfa..fe9092a 100644
--- a/components/series
+++ b/components/series
@@ -1,4 +1,5 @@
 seabios
+ovmf
 xen
 qemu
 qemu_traditional
diff --git a/components/xen b/components/xen
index ac9e8fb..9ff0222 100644
--- a/components/xen
+++ b/components/xen
@@ -25,6 +25,7 @@ function xen_check_package() {
 
 function xen_build() {
     local seabios_opt=""
+    local ovmf_opt=""
 
     cd "$BASEDIR"
     git-checkout $XEN_URL $XEN_REVISION xen-dir
@@ -33,8 +34,12 @@ function xen_build() {
     then
         seabios_opt="--with-system-seabios="$BASEDIR"/seabios-dir/out/bios.bin"
     fi
+    if [[ -e "$BASEDIR"/ovmf-dir/ovmf.bin ]]
+    then
+        ovmf_opt="--enable-ovmf --with-system-ovmf="$BASEDIR"/ovmf-dir/ovmf.bin"
+    fi
     ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386 \
-        --disable-qemu-traditional --enable-rombios $seabios_opt
+        --disable-qemu-traditional --enable-rombios $seabios_opt $ovmf_opt
     $RAISIN_MAKE
     $RAISIN_MAKE install DESTDIR="$INST_DIR"
     cd "$BASEDIR"
diff --git a/defconfig b/defconfig
index d3ef283..7d2a3f7 100644
--- a/defconfig
+++ b/defconfig
@@ -1,12 +1,12 @@
 # Config variables for raisin
 
 # Components
-## All components: seabios xen qemu qemu_traditional grub libvirt
+## All components: seabios ovmf xen qemu qemu_traditional grub libvirt
 ## Core xen functionality: xen
 ## Remove a component from the list below, if you want to disable it
 ## You can manually overwrite this list using the COMPONENTS
 ## environmental variable.
-ENABLED_COMPONENTS="seabios xen qemu qemu_traditional grub libvirt"
+ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
 
 # Build config
 ## Make command to run
@@ -27,6 +27,7 @@ QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-unstable.git"
 SEABIOS_URL="git://xenbits.xen.org/seabios.git"
 GRUB_URL="git://git.savannah.gnu.org/grub.git"
 LIBVIRT_URL="git://libvirt.org/libvirt.git"
+OVMF_URL="git://xenbits.xen.org/ovmf.git"
 
 # Software versions.
 XEN_REVISION="master"
@@ -35,3 +36,4 @@ QEMU_TRADITIONAL_REVISION="master"
 SEABIOS_REVISION="master"
 GRUB_REVISION="master"
 LIBVIRT_REVISION="master"
+OVMF_REVISION="master"