From patchwork Fri Jun 29 20:52:31 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: 140649 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1306869ljj; Fri, 29 Jun 2018 14:04:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcbcAhV/HEE0DkvsCwfhrU+4XL8s2IXSx5SeenCN2LYuOEFfpTdc5QbejObRiFqcn+m6RWN X-Received: by 2002:ac8:43c7:: with SMTP id w7-v6mr15191749qtn.371.1530306250111; Fri, 29 Jun 2018 14:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306250; cv=none; d=google.com; s=arc-20160816; b=WrD4uc9oB4KL3IFAQoiNsYh99LPxFhCWPvYB5c7ln8qm2OqjbTVDs9AO1tll/4H6fM VIXVm6VmL95o/yyj3176JRROR/+UIlRDWIuhIPOYLDUaO2H6k70gz4i9qLANDSFXOG6l QUYCFjObGEt0si6LucuSnxjE2YApEdn//pUC5nI6ARy4TXxKOl/3MOQ50NSiUQInAMSF MgLfc7MY+YlW/E50ib8I3I6+fnAertJpIsC2LJAC82/fAJTtjcvC01+RdBzbWHDtNOWy FrgVqthPcYIrvv+6S2Hij9juO1gDyhuoG9ILnW9em4LXsFK/2nDqfHT0kyruxzfiQNMs qcJg== 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=PtLG316CMmxeer8Tmeja1sS6NDX28BTKGaJUtFitFlk=; b=SkGE+o16cqP9VKlCsNJwh6Mfgbhsjs6+7zeCQlE+Vz+bZCdKbivab6BUKqD/Qyg0wV hwHEZWwyJsTv3lhmTi+eRhfJs2ScHPmyiMUqQlzFugOTNO/GPhAMC3tuYLNwAJMgdlj9 A0oiy1hVuYUJcZ0HMH3s1clx9GjC8u59LLaj8yp1TjDLSlrE9AK9JRtSiHI1qZwEhLPo F4nDLCBFbpvfoHpTRegb4+gAHraU8nPQMOw8E3OsDbqY3SoQ3LRTZzUl0JgdTusdafi/ 5xaBWQVopijWRL71dNZw6cPt2fkTw6IzxMJrUzo9f7u9w+Rw2r5jHxkCMcS7hFEjfvhb jVZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NqH7EZoW; 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 f35-v6si9542336qtd.28.2018.06.29.14.04.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:04:10 -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=NqH7EZoW; 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]:44470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Yr-0001os-Ft for patch@linaro.org; Fri, 29 Jun 2018 17:04:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sj-0004Gi-U1 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Sg-0005Ji-FC for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:49 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:50631) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Sg-0005J3-8U for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:46 -0400 Received: by mail-wm0-x242.google.com with SMTP id v25-v6so2447885wmc.0 for ; Fri, 29 Jun 2018 13:57:46 -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=PtLG316CMmxeer8Tmeja1sS6NDX28BTKGaJUtFitFlk=; b=NqH7EZoWgSJ7thSoG2gPWaPnSqEiAg0qVoy1BPTlHq5X4sEUG/buaQyOnpPn5fV2/l EskWwVRGLXehxutzE7/V9ouhrJsrgcfrr4yORdUAARRJ3rxW1iDZucHfxnZS1aBDMy4m sUlfE7VxMTsT9W8VWbGrjGqSS5lp6PZQYvAjA= 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=PtLG316CMmxeer8Tmeja1sS6NDX28BTKGaJUtFitFlk=; b=RxyaldpKQBM0zwdx921rKnco/Q/zBCAoCuw9xlP5Xjyrb5Y44FZ0b/o0F9psiR3Zk8 iSX+zH2ysNq0mz3//V3ASbETdX3u+D+ynQBXd2Ta/jsHCQkn+ejYZrYngoA0SV1x7ETp SiAQ5/C9FitRz6BMmpQPeCFfi7I8SgaTuYEjDJ9BGLrkTmB586vHdprn9lduuJjVVVeA ocp0u3+s7tWahvecGC7pIE7FTTXSg+lmhqaqWwBHQQLu7XIiGEpUcfOuMEU12+1zh93d Yeawk8VuG/+mRUf0x0a0FrW4KfUv2moNX9BSXXBUoz8fjh3Bw5lSRoNfStpqUmduR18T +lRw== X-Gm-Message-State: APt69E2COpG6SP2gW0nISEnD3oQYUp1dJdvJyhDaFUe7dergOyNzaq4s JOsB0Fw3N8gG2zZi92vcMTSnpA== X-Received: by 2002:a1c:149:: with SMTP id 70-v6mr2943893wmb.2.1530305865074; Fri, 29 Jun 2018 13:57:45 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 130-v6sm5499295wmr.1.2018.06.29.13.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5E91A3E0B75; Fri, 29 Jun 2018 21:52:34 +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: Fri, 29 Jun 2018 21:52:31 +0100 Message-Id: <20180629205232.27190-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::242 Subject: [Qemu-devel] [PATCH v2 20/21] 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 --- tests/docker/Makefile.include | 28 +++++++++++++++++++ .../debian-powerpc-user-cross.docker | 13 +++++++++ 2 files changed, 41 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 d3bd2f57dd..556b260fad 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -118,6 +118,30 @@ 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-image-debian-powerpc-user: DEB_ARCH = powerpc +docker-image-debian-powerpc-user: DEB_TYPE = jessie +docker-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc +DOCKER_USER_IMAGES += debian-powerpc-user +else +docker-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 + +docker-image-debian-powerpc-user-cross: docker-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), \ @@ -153,6 +177,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