From 54d0c1e1d20ca3d744c365322e5a81edc8cbbc82 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Wed, 23 Sep 2020 02:06:24 -0700 Subject: [PATCH] test images: Removes -p yes flag from qemu-user-static script call Currently, the Image Builder job is failing as it cannot build images for other architecture types. This happens because the Image Builder image does not have any of the expected qemu-* binaries in /usr/bin/ needed in order to run qemu-binfmt-conf.sh with the -p yes flag, so that flag is removed. --- test/images/image-util.sh | 2 +- third_party/multiarch/qemu-user-static/README.kubernetes | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/images/image-util.sh b/test/images/image-util.sh index 25a18488f84..e479952c00c 100755 --- a/test/images/image-util.sh +++ b/test/images/image-util.sh @@ -149,7 +149,7 @@ build() { if [[ $(id -u) != 0 ]]; then sudo=sudo fi - ${sudo} "${KUBE_ROOT}/third_party/multiarch/qemu-user-static/register/register.sh" --reset -p yes + ${sudo} "${KUBE_ROOT}/third_party/multiarch/qemu-user-static/register/register.sh" --reset curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/"${QEMUVERSION}"/x86_64_qemu-"${QEMUARCHS[$arch]}"-static.tar.gz | tar -xz -C "${temp_dir}" # Ensure we don't get surprised by umask settings chmod 0755 "${temp_dir}/qemu-${QEMUARCHS[$arch]}-static" diff --git a/third_party/multiarch/qemu-user-static/README.kubernetes b/third_party/multiarch/qemu-user-static/README.kubernetes index 4e046fe6a0b..d409f6ed591 100644 --- a/third_party/multiarch/qemu-user-static/README.kubernetes +++ b/third_party/multiarch/qemu-user-static/README.kubernetes @@ -1 +1,2 @@ -Files copied from https://github.com/multiarch/qemu-user-static at commit 22b0013668d2aed4a2cfd21650e85c664b1f21c6. +qemu-binfmt-confg.sh comes from https://github.com/qemu/qemu/blob/7c81570d932268a9626457a662f1c5046ebc455e/scripts/qemu-binfmt-conf.sh +register.sh comes from https://github.com/multiarch/qemu-user-static/blob/9898439ca975c9c4c0db2bdc4b3707d382559d09/containers/latest/register.sh