github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 16:57:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #333 from jschintag/qemu_configure_s390x

Browse Source 
s390x: add support to build qemu
This commit is contained in:
James O. D. Hunt 2019-02-07 17:20:59 +00:00 committed by GitHub
commit d48ccf4816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/configure-hypervisor.sh
View File

@ -245,6 +245,7 @@ generate_qemu_options() {
aarch64) ;; aarch64) ;;
x86_64) qemu_options+=(size:--disable-tcg) ;; x86_64) qemu_options+=(size:--disable-tcg) ;;
ppc64le) ;; ppc64le) ;;
s390x) qemu_options+=(size:--disable-tcg) ;;
esac esac
# SECURITY: Don't build a static binary (lowers security) # SECURITY: Don't build a static binary (lowers security)
@ -271,6 +272,11 @@ generate_qemu_options() {
qemu_options+=(size:--disable-debug-tcg) qemu_options+=(size:--disable-debug-tcg)
qemu_options+=(size:--disable-tcg-interpreter) qemu_options+=(size:--disable-tcg-interpreter)
;; ;;
s390x)
qemu_options+=(size:--disable-uuid)
qemu_options+=(size:--disable-debug-tcg)
qemu_options+=(size:--disable-tcg-interpreter)
;;
esac esac
qemu_options+=(size:--disable-qom-cast-debug) qemu_options+=(size:--disable-qom-cast-debug)
qemu_options+=(size:--disable-tcmalloc) qemu_options+=(size:--disable-tcmalloc)
@ -290,6 +296,7 @@ generate_qemu_options() {
aarch64) ;; aarch64) ;;
x86_64) qemu_options+=(size:--disable-xen) ;; x86_64) qemu_options+=(size:--disable-xen) ;;
ppc64le) qemu_options+=(size:--disable-xen) ;; ppc64le) qemu_options+=(size:--disable-xen) ;;
s390x) qemu_options+=(size:--disable-xen) ;;
esac esac
# FIXME: why is this disabled? # FIXME: why is this disabled?
@ -360,6 +367,7 @@ generate_qemu_options() {
aarch64) _qemu_cflags+=" -fPIC" ;; aarch64) _qemu_cflags+=" -fPIC" ;;
x86_64) _qemu_cflags+=" -fPIE" ;; x86_64) _qemu_cflags+=" -fPIE" ;;
ppc64le) _qemu_cflags+=" -fPIE" ;; ppc64le) _qemu_cflags+=" -fPIE" ;;
s390x) _qemu_cflags+=" -fPIE" ;;
esac esac
# Set compile options # Set compile options
@ -376,6 +384,7 @@ generate_qemu_options() {
aarch64) ;; aarch64) ;;
x86_64) [ -z "${static}" ] && _qemu_ldflags+=" -pie" ;; x86_64) [ -z "${static}" ] && _qemu_ldflags+=" -pie" ;;
ppc64le) [ -z "${static}" ] && _qemu_ldflags+=" -pie" ;; ppc64le) [ -z "${static}" ] && _qemu_ldflags+=" -pie" ;;
s390x) [ -z "${static}" ] && _qemu_ldflags+=" -pie" ;;
esac esac
# SECURITY: Disallow executing code on the stack. # SECURITY: Disallow executing code on the stack.