Install nasm and build ovmf with gcc on x86.
Signed-off-by: Wei Liu <wei.l...@citrix.com>
---
I have tested stretch 64 bit and 32 bit containers.
I haven't tested the build script itself.
---
automation/build/centos/7.2.dockerfile | 1 +
automation/build/debian/jessie.dockerfile | 1 +
automation/build/debian/stretch-i386.dockerfile | 1 +
automation/build/debian/stretch.dockerfile | 1 +
automation/build/ubuntu/trusty.dockerfile | 1 +
automation/build/ubuntu/xenial.dockerfile | 1 +
automation/scripts/build | 2 ++
7 files changed, 8 insertions(+)
diff --git a/automation/build/centos/7.2.dockerfile
b/automation/build/centos/7.2.dockerfile
index b9b626a9b1..c2f46b694c 100644
--- 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 9bb1bdf104..bd04209f7f 100644
--- 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 5b77c90db3..ec37a5fbf8 100644
--- 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 f068457ab6..9be09c5377 100644
--- 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 cc750873e3..1d04bccbdf 100644
--- 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 aa551c1b5c..37869e39ed 100644
--- 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 8bbca15a51..054226bd73 100755
--- 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[@]}"
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
