[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 33/56] tests/tcg: enable building for Alpha
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 33/56] tests/tcg: enable building for Alpha |
Date: |
Tue, 19 Jun 2018 16:44:12 +0100 |
We can't use our normal Debian based compilers as Alpha isn't an
officially supported architecture. However it is available as a port
and fortunately cross compilers for all these targets are included in
Debian Sid, the perpetual rolling/unstable/testing version of Debian.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
---
v5
- drop the unused debian-cross-build docker image
- add note to debian-sid docker image
- echo reference to notes on build failure
- include EXTRA_RUNS for mmap tests
v6
- use NOCACHE=1 for docker-image-debian-sid to force re-builds
- this seems a little hacky
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 4a2b028a3b..8c24f8807e 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -64,6 +64,13 @@ docker-image-debian-ppc64el-cross: docker-image-debian9
docker-image-debian-s390x-cross: docker-image-debian9
docker-image-debian-win32-cross: docker-image-debian8-mxe
docker-image-debian-win64-cross: docker-image-debian8-mxe
+
+# Debian SID images - we are tracking a rolling distro so we want to
+# force a re-build of the base image if we ever need to build one of
+# its children.
+docker-image-debian-sid: NOCACHE=1
+
+docker-image-debian-alpha-cross: docker-image-debian-sid
docker-image-travis: NOUSER=1
# Specialist build images, sometimes very limited tools
diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker
b/tests/docker/dockerfiles/debian-alpha-cross.docker
new file mode 100644
index 0000000000..29a25d0dfd
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-alpha-cross.docker
@@ -0,0 +1,12 @@
+#
+# Docker cross-compiler target
+#
+# This docker target builds on the debian sid base image which
+# contains cross compilers for Debian "ports" targets.
+#
+FROM qemu:debian-sid
+
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
+ apt-get install -y --no-install-recommends \
+ gcc-alpha-linux-gnu \
+ libc6.1-dev-alpha-cross || { echo "Failed to build - see
debian-sid.docker notes"; exit 1; }
diff --git a/tests/docker/dockerfiles/debian-sid.docker
b/tests/docker/dockerfiles/debian-sid.docker
new file mode 100644
index 0000000000..9a3d168705
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-sid.docker
@@ -0,0 +1,32 @@
+#
+# Debian Sid Base
+#
+# A number of our guests exist as ports only. We can either use the
+# ports repo or get everything from Sid. However Sid is a rolling
+# distro which may be broken at any particular time. If you are
+# unlucky and try and build your images while gcc is in the process of
+# being uploaded this can fail. Your only recourse is to try again in
+# a few hours when the repos have re-synced. Once built however you
+# won't be affected by repo changes unless the docker recipies are
+# updated and trigger a re-build.
+#
+
+FROM debian:sid-slim
+
+# Duplicate deb line as deb-src
+RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
/etc/apt/sources.list
+
+# Install common build utilities
+RUN apt update
+RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
+ apt install -y --no-install-recommends \
+ bison \
+ build-essential \
+ ca-certificates \
+ flex \
+ git \
+ pkg-config \
+ psmisc \
+ python \
+ texinfo || { echo "Failed to build - see debian-sid.docker notes";
exit 1; }
diff --git a/tests/tcg/alpha/Makefile.include b/tests/tcg/alpha/Makefile.include
new file mode 100644
index 0000000000..c7dc48eadb
--- /dev/null
+++ b/tests/tcg/alpha/Makefile.include
@@ -0,0 +1,2 @@
+DOCKER_IMAGE=debian-alpha-cross
+DOCKER_CROSS_COMPILER=alpha-linux-gnu-gcc
diff --git a/tests/tcg/alpha/Makefile.target b/tests/tcg/alpha/Makefile.target
new file mode 100644
index 0000000000..bedf1b6444
--- /dev/null
+++ b/tests/tcg/alpha/Makefile.target
@@ -0,0 +1,6 @@
+# -*- Mode: makefile -*-
+#
+# Alpha specific tweaks
+
+# On Alpha Linux only supports 8k pages
+EXTRA_RUNS+=run-test-mmap-8192
--
2.17.1
- [Qemu-devel] [PULL 19/56] tests/tcg/x86_64: add Makefile.target, (continued)
- [Qemu-devel] [PULL 19/56] tests/tcg/x86_64: add Makefile.target, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 31/56] tests/tcg: enable building for s390x, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 34/56] tests/tcg/alpha: add Alpha specific tests, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 32/56] tests/tcg: enable building for ppc64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 56/56] .travis.yml: add check-tcg test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 24/56] tests/tcg/arm: fix up test-arm-iwmmxt test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 45/56] tests/Makefile.include: add [build|clean|check]-tcg targets, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 46/56] tests/tcg: add run, diff, and skip helper macros, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 11/56] tests/tcg/multiarch: enable additional linux-test tests, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 12/56] tests/tcg/multiarch: don't hard code paths/ports for linux-test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 33/56] tests/tcg: enable building for Alpha,
Alex Bennée <=
- [Qemu-devel] [PULL 25/56] tests/tcg: enable building for AArch64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 23/56] tests/tcg: enable building for ARM, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 44/56] Makefile.target: add (clean-/build-)guest-tests targets, Alex Bennée, 2018/06/19
- Re: [Qemu-devel] [PULL 00/56] add check-tcg and associated machinery, Peter Maydell, 2018/06/20
- Re: [Qemu-devel] [PULL 00/56] add check-tcg and associated machinery, Peter Maydell, 2018/06/20