From 31f06676958cf960e23a505be762c078fae0624d Mon Sep 17 00:00:00 2001
From: Paulo Matos <pmatos@linki.tools>
Date: Wed, 13 Mar 2019 09:08:15 +0100
Subject: [PATCH] Pass qemu path

---
 .gitlab-ci.yml        | 4 ++--
 .gitlab/build-test.sh | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8352be69e..def07c37de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -211,7 +211,7 @@ prepare-cache:qemu:
     - export PATH=$INSTALL_DIR/bin:$PATH
     - apt-get update
   script:
-    - .gitlab/build-test.sh --jobs ${JOBS} --with-arch ${ARCH} --with-debian stretch --with-debian-mirror http://ftp.de.debian.org/debian/ --with-project-path ${CI_PROJECT_DIR} --with-chroot-path /tmp/racket-${ARCH}-${CI_COMMIT_SHORT_SHA}-chroot
+    - .gitlab/build-test.sh --jobs ${JOBS} --with-arch ${ARCH} --with-debian stretch --with-debian-mirror http://ftp.de.debian.org/debian/ --with-project-path ${CI_PROJECT_DIR} --with-chroot-path /tmp/racket-${ARCH}-${CI_COMMIT_SHORT_SHA}-chroot --with-qemu-path=$INSTALL_DIR
   cache:
     key: qemu-3.1.0
     policy: pull
@@ -301,7 +301,7 @@ test:ppc64el:
     - export PATH=$INSTALL_DIR:$PATH
     - apt-get update
   script:
-    - .gitlab/build-test.sh --jobs ${JOBS} --with-arch ${ARCH} --with-debian stretch --with-debian-mirror http://ftp.de.debian.org/debian/ --with-project-path ${CI_PROJECT_DIR} --with-chroot-path /tmp/racket-${ARCH}-${CI_COMMIT_SHORT_SHA}-chroot --enable-cs
+    - .gitlab/build-test.sh --jobs ${JOBS} --with-arch ${ARCH} --with-debian stretch --with-debian-mirror http://ftp.de.debian.org/debian/ --with-project-path ${CI_PROJECT_DIR} --with-chroot-path /tmp/racket-${ARCH}-${CI_COMMIT_SHORT_SHA}-chroot --enable-cs --with-qemu-path=$INSTALL_DIR
 
 test:x86_64:cs:
   extends: .preparearch:cs
diff --git a/.gitlab/build-test.sh b/.gitlab/build-test.sh
index b447c8688c..74869de3bd 100755
--- a/.gitlab/build-test.sh
+++ b/.gitlab/build-test.sh
@@ -41,6 +41,7 @@ ARCH="$(uname -m)"
 BUILD_DIR=${CI_PROJECT_DIR}
 MAKE_TARGET="in-place"
 CHROOT_DIR="/tmp/racket-chroot"
+QEMU_PATH=
 
 # Parse options
 until
@@ -80,6 +81,10 @@ until
 	    shift
 	    CHROOT_DIR=$1
 	    ;;
+	--with-qemu-path)
+	    shift
+	    QEMU_PATH=$1
+	    ;;
 	?*)
 	    usage "Unknown argument $1"
 	    ;;
@@ -144,7 +149,7 @@ function setup_chroot {
     mkdir "${CHROOT_DIR}"
     debootstrap --foreign --no-check-gpg --include=fakeroot,build-essential \
 		--arch="${ARCH}" "${DEBIAN}" "${CHROOT_DIR}" "${DEBIAN_MIRROR}"
-    cp /usr/bin/qemu-${QEMU_ARCH} "${CHROOT_DIR}"/usr/bin/
+    cp ${QEMU_PATH}/bin/qemu-${QEMU_ARCH} "${CHROOT_DIR}"/usr/bin/qemu-${QEMU_ARCH}-static
     chroot "${CHROOT_DIR}" ./debootstrap/debootstrap --second-stage
     sbuild-createchroot --arch="${ARCH}" --foreign --setup-only \
 			"${DEBIAN}" "${CHROOT_DIR}" "${DEBIAN_MIRROR}"