Commit 19c9a18f authored by Alex Bennée's avatar Alex Bennée
Browse files

docker: add linux-user powered cross builder for QEMU 



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: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent dc338fdb

tests/docker/Makefile.include

+33 −9
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker 
		$(error DEB_ARCH not set, debootstrap of debian-$* would fail))

	$(if $(DEB_TYPE),,\

		$(error DEB_TYPE not set, debootstrap of debian-$* would fail))

	$(if $(filter $(QEMU_TARGET),$(TARGET_DIRS)),				\

		$(call quiet-command,						\

			DEB_ARCH=$(DEB_ARCH)					\

			DEB_TYPE=$(DEB_TYPE)					\
@@ -72,7 +73,10 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker 
			$(if $(NOUSER),,--add-current-user) 			\

			$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))	\

			$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \

		"BUILD","binfmt debian-$* (debootstrapped)")

			"BUILD","binfmt debian-$* (debootstrapped)"),		\

		$(call quiet-command,						\

			$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<,	\

			"CHECK", "debian-$* exists"))



endif
@@ -117,6 +121,21 @@ 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.



# 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: QEMU_TARGET = ppc-linux-user

docker-binfmt-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc

docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user

DOCKER_USER_IMAGES += 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), \
@@ -146,6 +165,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)'

tests/docker/dockerfiles/debian-powerpc-user-cross.docker

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#

# 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