Enable use of qemu-3.1.0

This commit is contained in:
Paulo Matos 2019-03-13 08:27:37 +01:00
parent 3bd45fc0bb
commit 2fc8f46b7e
2 changed files with 22 additions and 2 deletions

View File

@ -207,69 +207,86 @@ prepare-cache:qemu:
- privileged
- linux
before_script:
- 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
cache:
key: qemu-3.1.0
policy: pull
paths:
- $INSTALL_DIR
test:x86_64:
extends: .preparearch
variables:
ARCH: "x86_64"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:arm64:
extends: .preparearch
variables:
ARCH: "arm64"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:armel:
extends: .preparearch
variables:
ARCH: "armel"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:armhf:
extends: .preparearch
variables:
ARCH: "armhf"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:i386:
extends: .preparearch
variables:
ARCH: "i386"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:mips:
extends: .preparearch
variables:
ARCH: "mips"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:mipsel:
extends: .preparearch
variables:
ARCH: "mipsel"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:mips64el:
extends: .preparearch
variables:
ARCH: "mips64el"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:s390x:
extends: .preparearch
variables:
ARCH: "s390x"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:ppc64el:
extends: .preparearch
variables:
ARCH: "ppc64el"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
.preparearch:cs:
@ -280,6 +297,7 @@ test:ppc64el:
- privileged
- linux
before_script:
- 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
@ -290,10 +308,12 @@ test:x86_64:cs:
variables:
ARCH: "x86_64"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install
test:i386:cs:
extends: .preparearch:cs
variables:
ARCH: "i386"
JOBS: 6
INSTALL_DIR: $CI_PROJECT_DIR/install

View File

@ -129,7 +129,7 @@ fi
# ---------------------------------------------------------------------------------------------------
# Packages to install on the HOST
HOST_DEPENDENCIES="debootstrap qemu-user-static binfmt-support sbuild rsync"
HOST_DEPENDENCIES="debootstrap binfmt-support sbuild rsync"
# Packages to install on the GUEST
GUEST_DEPENDENCIES="devscripts build-essential git m4 sudo python libfontconfig1-dev make gcc libpango1.0-dev libcairo2-dev openssl emacs25-nox libturbojpeg0-dev uuid-dev"
@ -144,7 +144,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}-static "${CHROOT_DIR}"/usr/bin/
cp /usr/bin/qemu-${QEMU_ARCH} "${CHROOT_DIR}"/usr/bin/
chroot "${CHROOT_DIR}" ./debootstrap/debootstrap --second-stage
sbuild-createchroot --arch="${ARCH}" --foreign --setup-only \
"${DEBIAN}" "${CHROOT_DIR}" "${DEBIAN_MIRROR}"