From patchwork Tue Jun 19 15:44:20 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: 139214 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5411982lji; Tue, 19 Jun 2018 09:26:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJuADLMyB9tEL7/r24yrFNrAMqM7RC9VhoUWziMAy04kAgpYGUK31/rfpQ2BhR76MoCwn/t X-Received: by 2002:a37:434c:: with SMTP id q73-v6mr14438511qka.339.1529425601326; Tue, 19 Jun 2018 09:26:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529425601; cv=none; d=google.com; s=arc-20160816; b=drLCAt5Ap+zqauAU1nxmaVQobA/hhByKR/1tkM4t9A2zZihqZPuOKAMqdixYE21C1k QVnoq4BNJ6/t39jpRwvD6btF9VHo/1NS6iGkUMDk5pTrao10s+poGNG92EM1D+fN98b2 Lqp/bmhUcMXhKQ4ol//1zgHQ3IESQJcxwjnI6rpM+qLGXWaUWjOMqVU/C2lpH67jxI6d 4v5EcNxDtXk1Dit0lqQ+9gSwupK1cDAV1Yq0+eRGKbddm8KM193BJCDSHl1nj2vv1Xdo SpI0Xf3J/Ts4UCVSafJlJAesuL5Lk7Dr3tFNZpZicw6KuTE7x4jjwFdEJqbmOUhh0Y77 2XTg== 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=lK3C7eefN/M5ARgLlVaJ1vI2dSg/CkCKjIFdrKykQNk=; b=s9c5gavF6guutmqV6HYb8hf+MKHdVCXJhKHDQUHtH7RnF/et0wGatT29ldCJuFZY8L rWVgF5qDAqpoi1X+VMPVjRb7k1cR/zJePQwh5BhbRkdqgilNlZ3IR2uuQOkDmk3ri3Km 8vMAWDXdbs6jjigOsRTOt/mkspWFG6mbXDBsUvAoLqU4KCSEOi+rTvWgXDFkDSweWz/y itJwFRf2GnyfosI+vn/t6TKOxuqpiKThg0WCoJxLvPer+KBV9k52JIofxQ8ue8u4ejdq /f8lH/Rpz4LT7DsNezXKyVqdVEI/4ASRPA1+6JyPq3sbhRDY528ef6BOZwrna641jKcr jA7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="O/Xjqwc7"; 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 g7-v6si89770qvj.177.2018.06.19.09.26.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:26:41 -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="O/Xjqwc7"; 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]:43615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJSq-0007or-Ls for patch@linaro.org; Tue, 19 Jun 2018 12:26:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIvM-0004Ai-0j for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIvA-0001h3-KY for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:03 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:37882) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIv7-0001cu-DH for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:51:52 -0400 Received: by mail-wm0-x244.google.com with SMTP id r125-v6so1376201wmg.2 for ; Tue, 19 Jun 2018 08:51:49 -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=lK3C7eefN/M5ARgLlVaJ1vI2dSg/CkCKjIFdrKykQNk=; b=O/Xjqwc7FiurlWiL4oauMW10OG/8gQ6X4EVjMs78G7wc5TyJ/aR8wvIT6jGJxIhXO1 B/Ns4Xf+5CDG4VrpVBgaJAsYjcwKtsDKTUpLl1S/QOTaz0mS/g8N+CdG34+OieXPMagU H3IZiwJ8/cUHL4f1LlZM48yUG0Zb14NUiwOzM= 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=lK3C7eefN/M5ARgLlVaJ1vI2dSg/CkCKjIFdrKykQNk=; b=fKOPVUwuypuhA8Q+PAajBus2vdc3tgOI6/47e/VpGma0MxgK0aXRIextDLIfTG/VD2 glfD0nXaaPvsaQf7HXM4rLErDohLnz6S0g5UZ1Vm9ekBfUFdqHsHSN24/SC6nbNE1JmM NoFgBLAh36S77Q0EBvnDXfZwmnzXn5dp3PteiHatUJAEUoz4Oxvyb/8ULy98wqaa57Td QfLQu/AF/gmgLat4aZ8JSEmXpBdTjCuN/RxlxcOcVBPHIgR9mdB/hjfQBLAePIbCBPnH 3kyBe0eVLqQEMs/csIsTCQ3cUorKXbP4QL2WgJZoyhBIZRmMmZQU3jrI1YFgE7+lxFl3 AhLQ== X-Gm-Message-State: APt69E25RmkwEn43Yx4p4CVVrMR/+/orkANdafENSNSslkijuFpUYTxq P09Ty1c/iXeOLkFVHDlVwUuYemyv0Vw= X-Received: by 2002:a1c:f106:: with SMTP id p6-v6mr12206914wmh.68.1529423508182; Tue, 19 Jun 2018 08:51:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i193-v6sm527885wmf.13.2018.06.19.08.51.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:51:45 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2A9BF3E0EF2; Tue, 19 Jun 2018 16:44:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:20 +0100 Message-Id: <20180619154435.18898-42-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-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::244 Subject: [Qemu-devel] [PULL 41/56] docker: move debian-powerpc-cross to sid based build 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" The original Jessie based cross builder hasn't worked for a while. The state of the libraries is still perilous for cross-building QEMU but we can use it for building TCG tests. The debian-apt-fake.sh script can also be dropped as it is no longer used. 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 a680743ae8..87f449264f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -47,8 +47,6 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") -docker-image-debian-powerpc-cross: EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-apt-fake.sh - # Enforce dependencies for composite images docker-image-debian: docker-image-debian9 docker-image-debian8-mxe: docker-image-debian8 @@ -59,7 +57,6 @@ docker-image-debian-arm64-cross: docker-image-debian9 docker-image-debian-mips-cross: docker-image-debian9 docker-image-debian-mipsel-cross: docker-image-debian9 docker-image-debian-mips64el-cross: docker-image-debian9 -docker-image-debian-powerpc-cross: docker-image-debian8 docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian8-mxe @@ -77,6 +74,7 @@ docker-image-debian-sh4-cross: docker-image-debian-sid docker-image-debian-sparc64-cross: docker-image-debian-sid docker-image-debian-mips64-cross: docker-image-debian-sid docker-image-debian-riscv64-cross: docker-image-debian-sid +docker-image-debian-powerpc-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools diff --git a/tests/docker/dockerfiles/debian-apt-fake.sh b/tests/docker/dockerfiles/debian-apt-fake.sh deleted file mode 100755 index 2ec0fdf47a..0000000000 --- a/tests/docker/dockerfiles/debian-apt-fake.sh +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh -# -# Generate fake debian package to resolve unimportant unmet dependencies held -# by upstream multiarch broken packages. -# -# Copyright (c) 2017 Philippe Mathieu-Daudé -# -# This work is licensed under the terms of the GNU GPL, version 2 -# or (at your option) any later version. See the COPYING file in -# the top-level directory. - -test $1 = "install" && shift 1 - -fake_install() -{ - echo "Generating fake $2 $1 $3 ..." - (cd /var/cache/apt/archives - (cat << 'EOF' -Section: misc -Priority: optional -Standards-Version: 3.9.2 - -Package: NAME -Version: VERSION -Maintainer: qemu-devel@nongnu.org -Architecture: any -Multi-Arch: same -Description: fake NAME -EOF - ) | sed s/NAME/$2/g | sed s/VERSION/$3/g > $2.control - equivs-build -a $1 $2.control 1>/dev/null 2>/dev/null - dpkg -i --force-overwrite $2_$3_$1.deb - ) -} - -try_install() -{ - name=$(echo $1|sed "s/\(.*\):\(.*\)=\(.*\)/\1/") - arch=$(echo $1|sed "s/\(.*\):\(.*\)=\(.*\)/\2/") - vers=$(echo $1|sed "s/\(.*\):\(.*\)=\(.*\)/\3/") - apt-get install -q -yy $1 || fake_install $arch $name $vers -} - -for package in $*; do - try_install $package -done diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker index a5dd46b4ac..5e62ca0df1 100644 --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker @@ -1,40 +1,13 @@ # # Docker powerpc cross-compiler target # -# This docker target builds on the debian Jessie base image. +# This docker target builds on the debian sid base image which +# contains cross compilers for Debian "ports" targets. The original +# Jessie based no longer builds. # -FROM qemu:debian8 -MAINTAINER Philippe Mathieu-Daudé +FROM qemu:debian-sid -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture powerpc -RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ - crossbuild-essential-powerpc - -# to fix "following packages have unmet dependencies" ... -ADD debian-apt-fake.sh /usr/local/bin/apt-fake -RUN apt-get install -y --no-install-recommends \ - equivs \ - pkg-config -RUN apt-fake install \ - pkg-config:powerpc=0.28-1.1-fake && \ - ln -s pkg-config /usr/bin/powerpc-linux-gnu-pkg-config -ENV PKG_CONFIG_PATH /usr/lib/powerpc-linux-gnu/pkgconfig -# - -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc-linux-gnu- - -RUN DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get build-dep -yy -a powerpc qemu -RUN DEBIAN_FRONTEND=noninteractive \ - apt-get install -y --no-install-recommends \ - glusterfs-common:powerpc \ - libbz2-dev:powerpc \ - liblzo2-dev:powerpc \ - libncursesw5-dev:powerpc \ - libnfs-dev:powerpc \ - librdmacm-dev:powerpc \ - libsnappy-dev:powerpc + gcc-powerpc-linux-gnu \ + libc6-dev-powerpc-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } diff --git a/tests/docker/dockerfiles/debian8.docker b/tests/docker/dockerfiles/debian8.docker index 1bcf2e3d2f..52945631cd 100644 --- a/tests/docker/dockerfiles/debian8.docker +++ b/tests/docker/dockerfiles/debian8.docker @@ -32,6 +32,3 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ pkg-config \ python-minimal -# Setup Emdebian [emdebian-archive-keyring] -RUN echo "deb http://emdebian.org/tools/debian/ jessie main" > /etc/apt/sources.list.d/emdebian.list && \ - curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -