From patchwork Mon Jul 2 14:30:21 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: 140783 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp32525ljj; Mon, 2 Jul 2018 07:38:55 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcZViBcqAJYf50RItaNiK986ZZMMjcbv+WNN2lh41vOOiHMswIpl6Qb8gDmDSsTRgXNW4GP X-Received: by 2002:a0c:e345:: with SMTP id a5-v6mr16820652qvm.133.1530542335603; Mon, 02 Jul 2018 07:38:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542335; cv=none; d=google.com; s=arc-20160816; b=Htwj9pQJyVlNOmf+F+PdxX6engKNIhkM2J/M57HLMGJDUsnr4uq06Z3XDme7cOr5zV RKix/JPT+MUXEWjQvjTcTIJfbfTlTKAvWdCc+uxsNHwrmmR7ge1KFUMssZaBxIsiIvN5 Fr5cbzQTQdBwFZaP9lxuV0noRnZkz0EXqktflsbA0w/zXG0+njBqOV9y04a4aK+oD3En KPsKr6wnvCQLDtmyQDP/EGPNBpyGCv0rPJf9GKK1hGMVHbIcrWmFVMKzaTyLavaBcq+h rZs/JX36o4LV78cXz9PmUJvexeeYGn2aHXWeJE+DZwBGwYRvLpgErAiOHOCBHJlFtx98 nc5g== 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=SgBreGhL0rTgtWV9GmkJ558/SljFCMZ3OU+EpZwVNW4=; b=kuQalS118LJfyKkUf+CTCbvPkX+WeqIggvR85hre/Z4QyOeknMjpPoR0vdiMIrcv5g DMnp5xBKbpeE9J1GPd3Um/bIOI6CX258I+RU0vRzJZ5knK7gDEu1sloncUVdj+ENnzWu WxOPwiytc5ZnJzXGvZWRMjC60E/lE3kHER4A2ylOweaFrlpze0TTa6AqMVXnFPOpGwpA lwReUmgzcBNpQr1bqDKlKAll8Pw9CY4fBPxiRedC1EB8kkI9B5np+FsmzwSi9TxFhLUr 1GHdrRtl11dMrssKBTMjXwk2KvVVtQGLouwxlUcC1Z7dgpHsdxvlvhrQ7pnINnxhpqje cBQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eDN6O4bu; 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 s35-v6si4205057qta.330.2018.07.02.07.38.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:38:55 -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=eDN6O4bu; 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]:33180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzyh-0002ly-1F for patch@linaro.org; Mon, 02 Jul 2018 10:38:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqh-0005WM-EW for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqg-0000ZL-7h for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:39 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:43591) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqg-0000YV-0L for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:38 -0400 Received: by mail-wr0-x243.google.com with SMTP id f18-v6so2067630wre.10 for ; Mon, 02 Jul 2018 07:30:37 -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=SgBreGhL0rTgtWV9GmkJ558/SljFCMZ3OU+EpZwVNW4=; b=eDN6O4bu3FMcTD/Of02QFh0OW9MVbDoar7OkbJrN2+sLb4cusoqEz5jW8NPWMjhXkO fYdx2kgY35Rc8L3mHyQhmRWvA/qYLi+OVNjpg7vFJNIVPd63a6Wh9Hq9Ey/tEaBcj2vo wfhF1AETS/FEaSnmVyIDNW8TOs/+LVyyMmroM= 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=SgBreGhL0rTgtWV9GmkJ558/SljFCMZ3OU+EpZwVNW4=; b=KYJEuMD4ShyA1BaNWn6YkQJonbWu4Rc+V7a0Ux316l9XoDdf8WYu8yudKDUnQQTi4K OcZwhyqPpN/0dnuFIEttAC7WzH3c4ZDuaRbJVTVUKXJCoTf3H2EQwYuZpijJT3MnEaPF o2A/xIZ3PVxe+fvv/9W4YopYM3hlmrl/zCNeQpp8sFDYyKGtdzYssA0l0fbtUn2XPVW7 DZGNlJfQ4i3iiKnAvAB23SGSqFSxW5v8p7M7z1oXKKWKdAT+WU+O+rKBr86snvwzNSvD cJV5jbggZilRpQRGo8eZhs7zFPDTG86HKew6utZq9Q3Y8FssQD7Ctp5OlIhGIui21TMj xbRw== X-Gm-Message-State: APt69E2HuNWlAetai6Rm+fJCZ7xMuJCYD8Sag9QE6JLF1jLH64Rqcc8+ rIkymtwmJU0WDBJY4YRDq9/VTQ== X-Received: by 2002:adf:b1d2:: with SMTP id r18-v6mr11162443wra.79.1530541836909; Mon, 02 Jul 2018 07:30:36 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u13-v6sm8333280wri.72.2018.07.02.07.30.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 612453E0BB0; Mon, 2 Jul 2018 15:30:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 2 Jul 2018 15:30:21 +0100 Message-Id: <20180702143021.18864-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:c0c::243 Subject: [Qemu-devel] [PATCH v3 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 it's 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 --- v3 - fix for rename of docker-binfmt-image-debian-powerpc-user --- tests/docker/Makefile.include | 29 +++++++++++++++++++ .../debian-powerpc-user-cross.docker | 13 +++++++++ 2 files changed, 42 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-powerpc-user-cross.docker -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index fdc87b8a57..85801702dd 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -119,6 +119,31 @@ 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: + $(call quiet-command, \ + $(DOCKER_SCRIPT) check --quiet qemu:debian-powerpc-user \ + $(DOCKER_FILES_DIR)/debian-bootstrap.docker, \ + "CHECK", "debian-powerpc-user exists") +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), \ @@ -154,6 +179,10 @@ docker: @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)' +ifneq ($(DOCKER_USER_IMAGES),) + @echo 'Available linux-user images:' + @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..eadb142792 --- /dev/null +++ b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker @@ -0,0 +1,13 @@ +# +# 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 apt-get update && apt-get build-dep -yy qemu