[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/20] docker: add linux-user powered cross builder f
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 20/20] docker: add linux-user powered cross builder for QEMU |
Date: |
Tue, 3 Jul 2018 11:14:44 +0100 |
We can't use cross compilers in the current Debian stable and Debian
sid is sketchy as hell. So for powerpc fall back to dog-fooding our
own linux-user to do the build.
As we can only build the base image with a suitably configured
source tree we fall back to checking for its existence when we can't
build it from scratch. However this does mean you don't have to keep
a static powerpc-linux-user in your active configuration just to
update the cross build image.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index d43af0db32..12852ebbc4 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -121,6 +121,32 @@ docker-image-travis: NOUSER=1
# Specialist build images, sometimes very limited tools
docker-image-tricore-cross: docker-image-debian9
+# Rules for building linux-user powered images
+#
+# These are slower than using native cross compiler setups but can
+# work around issues with poorly working multi-arch systems and broken
+# packages.
+
+ifeq ($(filter ppc-linux-user,$(TARGET_LIST))$(CONFIG_STATIC),ppc-linux-usery)
+# Jessie is the last supported release for powerpc, but multi-arch is
+# broken so we need a qemu-linux-user for this target
+docker-binfmt-image-debian-powerpc-user: DEB_ARCH = powerpc
+docker-binfmt-image-debian-powerpc-user: DEB_TYPE = jessie
+docker-binfmt-image-debian-powerpc-user: EXECUTABLE =
${BUILD_DIR}/ppc-linux-user/qemu-ppc
+DOCKER_USER_IMAGES += debian-powerpc-user
+else
+docker-binfmt-image-debian-powerpc-user:
+ $(if,$(call quiet-command, \
+ $(DOCKER_SCRIPT) check --quiet qemu:debian-powerpc-user \
+ $(DOCKER_FILES_DIR)/debian-bootstrap.docker, \
+ "CHECK", "debian-powerpc-user exists"),\
+ $(error To build $@ you need a --static ppc-linux-user and
configured binfmt_misc setup))
+endif
+
+# We build the QEMU compiler environment on top of the base image
+docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user
+
+
# Expand all the pre-requistes for each docker image and test combination
$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES)
$(DOCKER_DEPRECATED_IMAGES)), \
$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
@@ -156,6 +182,11 @@ docker:
@echo
@echo 'Available container images:'
@echo ' $(DOCKER_IMAGES)'
+ifneq ($(DOCKER_USER_IMAGES),)
+ @echo
+ @echo 'Available linux-user images (docker-binfmt-image-debian-%):'
+ @echo ' $(DOCKER_USER_IMAGES)'
+endif
@echo
@echo 'Available tests:'
@echo ' $(DOCKER_TESTS)'
diff --git a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker
b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker
new file mode 100644
index 0000000000..6938a845ee
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker
@@ -0,0 +1,15 @@
+#
+# Docker powerpc cross-compiler target for QEMU
+#
+# We can't use current Debian stable cross-compilers to build powerpc
+# as it has been dropped as a release architecture. Using Debian Sid
+# is just far too sketchy a build environment. This leaves us the
+# final option of using linux-user. This image is based of the
+# debootstrapped qemu:debian-powerpc-user but doesn't need any extra
+# magic once it is setup.
+#
+FROM qemu:debian-powerpc-user
+
+RUN echo man-db man-db/auto-update boolean false | debconf-set-selections
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu
--
2.17.1
- [Qemu-devel] [PULL 05/20] docker: add gcovr to travis image, (continued)
- [Qemu-devel] [PULL 05/20] docker: add gcovr to travis image, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 06/20] travis: add gcovr summary for GCOV build, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 08/20] build-system: add coverage-report target, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 07/20] build-system: add clean-coverage target, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 17/20] docker: debian-bootstrap.pre allow customising of variant/url, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 10/20] linux-user: add gcov support to preexit_cleanup, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 12/20] docker: ubuntu: Update the package list before installing new ones, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 09/20] linux-user: introduce preexit_cleanup, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 19/20] docker: add special rule for deboostrapped images, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 18/20] docker: add special handling for FROM:debian-%-user targets, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 20/20] docker: add linux-user powered cross builder for QEMU,
Alex Bennée <=
- [Qemu-devel] [PULL 14/20] docker: Clean the MXE base image, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 15/20] docker: Do not run tests in 'intermediate' images, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 13/20] docker: ubuntu: Use SDL2, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 11/20] docker: filter out linux-user builds for mingw, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 16/20] docker: drop QEMU build-dep from bootstrap, Alex Bennée, 2018/07/03
- Re: [Qemu-devel] [PULL 00/20] Travis, Code Coverage and Cross Build updates, Paolo Bonzini, 2018/07/03
- Re: [Qemu-devel] [PULL 00/20] Travis, Code Coverage and Cross Build updates, Alex Bennée, 2018/07/04