From patchwork Tue Jul 3 10:14:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 140947 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp987137ljj; Tue, 3 Jul 2018 03:29:32 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd2Wk3XrVDzEjMNhc5ouBsbRCco5pg2r1B3izQXVkdyHgDtrfBNVUpAs81d2eiTtZhQ0Pa0 X-Received: by 2002:aed:3766:: with SMTP id i93-v6mr27419361qtb.277.1530613772190; Tue, 03 Jul 2018 03:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613772; cv=none; d=google.com; s=arc-20160816; b=YIJ55EcKGp/I+P6KGCBqlfa8vAA4xJOh+rtF2rUPp+oJjAiXwB4wdlzTpTlnwCiAf9 zquBQ53YQehxpnhhfQ2wBWKFAQ/Pt8XxZIwTSN80Dczuw9PSpiz4nbvZOQyEtdqTpgHZ fEVWuWGqEzotR2n3wNt68tjH7ffrUw0eLRxcQrFDHfVEZBuUflQSDfEu9QbUIH2NJJZY 9o+aMI4ouqV3yP5vivCgv12Rupv3zK/z/FlamTSn0EnHl2kIR1JqJQHd3lZv/d6JDw+E JQi2cqCoECwq7e+fgHjlssuDUw45FDQOPUsFpD1yS+BEy5Y20L327BIEZVYDFVyUQQqs FP1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=1TZ8UFL28lYw7e8FtBRDZ3v7mzvmort2kp3kI1KhBj4=; b=be9VeStaRBfq6oam5Y9nLI5ZDHmsqPW8trE2Y+qwufKTa997g/gw6fxJS0n1FMscaB a8HxW4eCDJxWzOvJpwdIsOQBK8+e8wEoU02WnGnzEgEI39I4XEwVlrVeIdszcH9SJv8s wcZ9nBjPycVEwfMxPLfilAnQtATGcA7K2UxXBAac7/P1mXBZ9WwECx/vV0v1WUzwMsCO oO487GlO7rSRSoBN59ZlHrGDeQeXxWl8zZtCIZnavpMgTjOrStJ0E0WcAvAObv6YbNmx kNN2NHzFiuhsiU6bBxeTGvH3JT4mH5Yalz/pRj/esyFr9R1iz78NH+jMPMv/vG5ycVhS bi3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RlAUCNTW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 22-v6si751475qtx.31.2018.07.03.03.29.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:29:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RlAUCNTW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIYt-0001OP-HX for patch@linaro.org; Tue, 03 Jul 2018 06:29:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISo-0004Z7-QS for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISn-0004Xz-9p for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:14 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:53653) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISn-0004Xl-1X for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:13 -0400 Received: by mail-wm0-x241.google.com with SMTP id b188-v6so1732949wme.3 for ; Tue, 03 Jul 2018 03:23:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1TZ8UFL28lYw7e8FtBRDZ3v7mzvmort2kp3kI1KhBj4=; b=RlAUCNTWvCvOHcxv2kPkpKhCPqHsma00qO8iC5ulN8R0G6c9Wkqbk/LNDTd0428rok x87nsVqgmw/ncOdkyZ7gXIGkJ+btiWvYKlevt9SYSGiEWaSD8W54XylegGBVu84pzrX0 7IJD6OGIQlF43whFyleREJTR8ebcsXEpMo4u8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1TZ8UFL28lYw7e8FtBRDZ3v7mzvmort2kp3kI1KhBj4=; b=Y6PMQ6av6iqNGLcOxq0/vHSKc33ZdeVG6QkVMWEpygcDigDqk4kuvmyEHjRgyXLqjG GWLIsnGZUHxhuVpLylW9/ZV+P/IeHVPN/McfbOV6nW/foix+o8XZaNoY+ulXegmHKPOk nFzaHGchZyQLj2F/sOmQSfubzT1RDG6upp/RyPkBOHzdIisEfgnxCl8GWfuuSaNT7ird bWv//nnYT4q3k52R0U1fmQQL0flcPZFn849ezzQuZf6JYY8oJRjTwLVOFZHp28zTzEgJ P3vXYtlzPWeTxDsRzZrotXFWVpEaiYIbQSfAH8DCjGFbCu+OmworWOURDAUXCxhOsWXt qEkg== X-Gm-Message-State: APt69E3gamP0HHoguzyp7dWW9LQR0yiaOFFqebJARrJsCQgWR9KzPeIl O6ghNckxZzbGQQjdp3uGMYY0hqIGR+g= X-Received: by 2002:a1c:e8c:: with SMTP id 134-v6mr10792960wmo.51.1530613391913; Tue, 03 Jul 2018 03:23:11 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x15-v6sm1453932wme.24.2018.07.03.03.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 244B53E0B6C; Tue, 3 Jul 2018 11:14:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:44 +0100 Message-Id: <20180703101444.23778-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 20/20] docker: add linux-user powered cross builder for QEMU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 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