github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 15:32:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12 from chavafg/topic/remove-static-option

Browse Source 
qemu: does not use --disable-static for qemu 2.11
This commit is contained in:
Julio Montes 2018-03-28 17:28:47 -05:00 committed by GitHub
commit 2079f90290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/configure-hypervisor.sh
View File

@ -268,8 +268,11 @@ main()
# Disable TCG support # Disable TCG support
qemu_options+=(size:--disable-tcg) qemu_options+=(size:--disable-tcg)
# Don't build a static binary (lowers security) # SECURITY: Don't build a static binary (lowers security)
qemu_options+=(security:--disable-static) # needed if qemu version is less than 2.7
if [ ${qemu_version_major} -eq 2 ] && [ ${qemu_version_minor} -lt 7 ]; then
qemu_options+=(--disable-static)
fi
# Not required as "-uuid ..." is always passed to the qemu binary # Not required as "-uuid ..." is always passed to the qemu binary
qemu_options+=(size:--disable-uuid) qemu_options+=(size:--disable-uuid)
@ -309,7 +312,10 @@ main()
qemu_options+=(speed:--enable-vhost-net) qemu_options+=(speed:--enable-vhost-net)
# Always strip binaries # Always strip binaries
qemu_options+=(size:--enable-strip) # needed if qemu version is less than 2.7
if [ ${qemu_version_major} -eq 2 ] && [ ${qemu_version_minor} -lt 7 ]; then
qemu_options+=(--enable-strip)
fi
# Support Ceph RADOS Block Device (RBD) # Support Ceph RADOS Block Device (RBD)
qemu_options+=(functionality:--enable-rbd) qemu_options+=(functionality:--enable-rbd)