automation/build: build ovmf

Install nasm and build ovmf with gcc on x86.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Doug Goldstein <cardoe@cardoe.com>

diff --git a/automation/build/centos/7.2.dockerfile b/automation/build/centos/7.2.dockerfile
index b9b626a9b1417761e87fd6a997c44e8c81fc3191..c2f46b694cc0a0ca084f7e77d5e725748684fa3b 100644 (file)
--- a/automation/build/centos/7.2.dockerfile
+++ b/automation/build/centos/7.2.dockerfile
@@ -46,4 +46,5 @@ RUN rpm --rebuilddb && \
         dev86 \
         xz-devel \
         bzip2 \
+        nasm \
     && yum clean all

diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile
index 9bb1bdf1044d1ec1f4a9c159aee887d1ba1b94ca..bd04209f7f24872cfaf89514d9be1896bea07fa3 100644 (file)
--- a/automation/build/debian/jessie.dockerfile
+++ b/automation/build/debian/jessie.dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update && \
         checkpolicy \
         wget \
         git \
+        nasm \
         && \
         apt-get autoremove -y && \
         apt-get clean && \

diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile
index 5b77c90db3fe4b2e8d02c2c44b3bed1598fe3e4c..ec37a5fbf87fdd0bfbd8fa1143bef2db4a929348 100644 (file)
--- a/automation/build/debian/stretch-i386.dockerfile
+++ b/automation/build/debian/stretch-i386.dockerfile
@@ -43,6 +43,7 @@ RUN apt-get update && \
         checkpolicy \
         wget \
         git \
+        nasm \
         && \
         apt-get autoremove -y && \
         apt-get clean && \

diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
index f068457ab659455164749af76b1122f8a8bdc0c0..9be09c5377c29ab4219017b83f3c4d09697c951f 100644 (file)
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update && \
         checkpolicy \
         wget \
         git \
+        nasm \
         && \
         apt-get autoremove -y && \
         apt-get clean && \

diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/ubuntu/trusty.dockerfile
index cc750873e3d3583ae0c4f8985a516dd47fe1fa69..1d04bccbdfbcd1586e8b3cd88d5ac1ae011da524 100644 (file)
--- a/automation/build/ubuntu/trusty.dockerfile
+++ b/automation/build/ubuntu/trusty.dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update && \
         checkpolicy \
         wget \
         git \
+        nasm \
         && \
         apt-get autoremove -y && \
         apt-get clean && \

diff --git a/automation/build/ubuntu/xenial.dockerfile b/automation/build/ubuntu/xenial.dockerfile
index aa551c1b5cd562eda0d3ddaf6159e4b8ce0e884c..37869e39ede1066844e4bc1f3daded4ad510fa3f 100644 (file)
--- a/automation/build/ubuntu/xenial.dockerfile
+++ b/automation/build/ubuntu/xenial.dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update && \
         checkpolicy \
         wget \
         git \
+        nasm \
         && \
         apt-get autoremove -y && \
         apt-get clean && \

diff --git a/automation/scripts/build b/automation/scripts/build
index 8bbca15a517e0dc5e7124a22f4f43b7a2b36817e..054226bd7361f7d8f2761182aec55f722189a7f8 100755 (executable)
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -24,6 +24,8 @@ fi
 
 if [[ "${XEN_TARGET_ARCH}" == "arm64" || "${XEN_TARGET_ARCH}" == "arm32" ]]; then
     cfgargs+=("--disable-tools") # we don't have the cross depends installed
+elif [[ "${CC}" != "clang" ]]; then
+    cfgargs+=("--enable-ovmf") # build ovmf with gcc on x86, arm doesn't use in-tree ovmf
 fi
 
 ./configure "${cfgargs[@]}"