github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-11 04:42:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1496 from wainersm/qemu_5_2-respin

Browse Source 
Bump to QEMU 5.2.0 - respin
This commit is contained in:
Wainer Moschetta 2021-03-12 09:48:14 -03:00 committed by GitHub
commit 943a7553be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
snap/snapcraft.yaml
View File

@ -278,7 +278,7 @@ parts:
chmod +x ${configure_hypervisor} chmod +x ${configure_hypervisor}
# static build. The --prefix, --libdir, --libexecdir, --datadir arguments are # static build. The --prefix, --libdir, --libexecdir, --datadir arguments are
# based on PREFIX and set by configure-hypervisor.sh # based on PREFIX and set by configure-hypervisor.sh
echo "$(PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr ${configure_hypervisor} -s qemu) \ echo "$(PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr ${configure_hypervisor} -s kata-qemu) \
--disable-rbd " \ --disable-rbd " \
| xargs ./configure | xargs ./configure
@ -294,7 +294,6 @@ parts:
- -usr/bin/qemu-pr-helper - -usr/bin/qemu-pr-helper
- -usr/bin/virtfs-proxy-helper - -usr/bin/virtfs-proxy-helper
- -usr/include/ - -usr/include/
- -usr/libexec/
- -usr/share/applications/ - -usr/share/applications/
- -usr/share/icons/ - -usr/share/icons/
- -usr/var/ - -usr/var/

2
tools/packaging/scripts/configure-hypervisor.sh
View File

@ -474,6 +474,8 @@ generate_qemu_options() {
# On version 5.2.0 onward the Meson build system warns to not use -O3 # On version 5.2.0 onward the Meson build system warns to not use -O3
if ! gt_eq "${qemu_version}" "5.2.0" ; then if ! gt_eq "${qemu_version}" "5.2.0" ; then
_qemu_cflags+=" -O3" _qemu_cflags+=" -O3"
else
_qemu_cflags+=" -O2"
fi fi
# Improve code quality by assuming identical semantics for interposed # Improve code quality by assuming identical semantics for interposed