github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-23 14:08:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9914 from Amulyam24/qemu-fix

Browse Source 
kata-deploy: fix qemu static build on ppc64le
This commit is contained in:
Amulya Meka 2024-07-02 10:45:03 +05:30 committed by GitHub
commit dd12089e0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/virtcontainers/qemu_ppc64le.go
View File

@ -26,7 +26,7 @@ const defaultQemuPath = "/usr/bin/qemu-system-ppc64"
const defaultQemuMachineType = QemuPseries
const defaultQemuMachineOptions = "accel=kvm,usb=off"
const defaultQemuMachineOptions = "accel=kvm,usb=off,cap-ail-mode-3=off"
const qmpMigrationWaitTimeout = 5 * time.Second

1
tools/packaging/static-build/qemu/Dockerfile
View File

@ -64,7 +64,6 @@ RUN apt-get update && apt-get upgrade -y && \
rsync \
zlib1g-dev${DPKG_ARCH} && \
if [ "${ARCH}" != s390x ]; then apt-get install -y --no-install-recommends libpmem-dev${DPKG_ARCH}; fi && \
if [ "${ARCH}" == ppc64le ]; then apt-get install -y --no-install-recommends librados-dev librbd-dev; fi && \
GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64le"; fi && \
if [ "${ARCH}" != "$(uname -m)" ]; then apt-get install --no-install-recommends -y gcc-"${GCC_ARCH}"-linux-gnu; fi && \
apt-get clean && rm -rf /var/lib/apt/lists/