suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass qemu path

Browse Source
This commit is contained in:
Paulo Matos 2019-03-13 09:08:15 +01:00
parent 0b715b5077
commit 31f0667695
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -211,7 +211,7 @@ prepare-cache:qemu:
- export PATH=$INSTALL_DIR/bin:$PATH - export PATH=$INSTALL_DIR/bin:$PATH
- apt-get update - apt-get update
script: 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: cache:
key: qemu-3.1.0 key: qemu-3.1.0
policy: pull policy: pull
@ -301,7 +301,7 @@ test:ppc64el:
- export PATH=$INSTALL_DIR:$PATH - export PATH=$INSTALL_DIR:$PATH
- apt-get update - apt-get update
script: 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: test:x86_64:cs:
extends: .preparearch:cs extends: .preparearch:cs

7
.gitlab/build-test.sh
View File

@ -41,6 +41,7 @@ ARCH="$(uname -m)"
BUILD_DIR=${CI_PROJECT_DIR} BUILD_DIR=${CI_PROJECT_DIR}
MAKE_TARGET="in-place" MAKE_TARGET="in-place"
CHROOT_DIR="/tmp/racket-chroot" CHROOT_DIR="/tmp/racket-chroot"
QEMU_PATH=
# Parse options # Parse options
until until
@ -80,6 +81,10 @@ until
shift shift
CHROOT_DIR=$1 CHROOT_DIR=$1
;; ;;
--with-qemu-path)
shift
QEMU_PATH=$1
;;
?*) ?*)
usage "Unknown argument $1" usage "Unknown argument $1"
;; ;;
@ -144,7 +149,7 @@ function setup_chroot {
mkdir "${CHROOT_DIR}" mkdir "${CHROOT_DIR}"
debootstrap --foreign --no-check-gpg --include=fakeroot,build-essential \ debootstrap --foreign --no-check-gpg --include=fakeroot,build-essential \
--arch="${ARCH}" "${DEBIAN}" "${CHROOT_DIR}" "${DEBIAN_MIRROR}" --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 chroot "${CHROOT_DIR}" ./debootstrap/debootstrap --second-stage
sbuild-createchroot --arch="${ARCH}" --foreign --setup-only \ sbuild-createchroot --arch="${ARCH}" --foreign --setup-only \
"${DEBIAN}" "${CHROOT_DIR}" "${DEBIAN_MIRROR}" "${DEBIAN}" "${CHROOT_DIR}" "${DEBIAN_MIRROR}"