From patchwork Fri Jun 15 19:46:52 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: 138805 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1285836lji; Fri, 15 Jun 2018 13:30:01 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLQMfBt6IKm2gk2DjOSdS4K/mK0Lq6KJcXaV//51Mha2M5v7pOyAOigbWh4m4GEIaSmNj2g X-Received: by 2002:ac8:1c6e:: with SMTP id j43-v6mr2998244qtk.218.1529094601683; Fri, 15 Jun 2018 13:30:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529094601; cv=none; d=google.com; s=arc-20160816; b=kM8+CwmZRQpor09k1vsCtGcAkYRDn3byDJiFkJ9cmAvkdWgUVI17P1Ep0xkYhfZiKa dKMTj9s6xFhNqkS1Di9SM4c6aTKcaQtfg0BQGZKc4CYMocIc/KlKPWF3IpmTNmXBjZYg woPhcDKQGAsnMhQTUXLF8D0pPoej2vbA6sywy16C7b4a8selX1mCghRzmYsYLlqNj7By 47ByslIzcdfSfGXsCWdwukuXnIlYwYuSSbnCvaFrx5wyBEd0maFqc337kaflSwsGGp92 mVsHQASo+/ZPji9Ml8NYTnh5cWsbXKdMCOr7YnqrXFwpqiv7UxbhomQWMgWrrxmtR8rq gnxw== 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=ZFxJCWiddpjHXwjZl0+KmFzpCZFLZeujAR90zPCt0CU=; b=IvOkrWb2dJe9p3+b2zKPw9j8Iy5U/dv5EAV2WIs8iwf8MbAEIO40kyLUmrtWPiKWDc 7ZNJ5pVJAtmvBNrmIJbIHudpV9C9PscrGQiV+f8VP0l+oIHM/qnwfXeUuJ5BproPKk3K e5U4QyrvoWs5sVimL3RDolCEdEhga9ShQT4urJ32GYNYgqwirmvv+/8bZzAujOwZDm0Y THhJ3gHx0JFei5t1ME2G9T370Mk3AwCFXHz3dNjAJTDAqfGhvSJ23xMjGuVQUMADq7mv eYU0PWcGMIMIYO2RwNMU/EaC2SvPiaJwb286VPpkhwweC6j9Okr+LPUkZoVHT4eoNySB rQBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CQu6kYQR; 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 k67-v6si107924qte.58.2018.06.15.13.30.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 13:30:01 -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=CQu6kYQR; 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]:49221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvM9-0002n8-3h for patch@linaro.org; Fri, 15 Jun 2018 16:30:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuoa-0000Zx-CG for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTuoY-0006bM-8f for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:20 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:38794) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTuoX-0006ZD-Uz for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:18 -0400 Received: by mail-wr0-x241.google.com with SMTP id e18-v6so10999870wrs.5 for ; Fri, 15 Jun 2018 12:55:17 -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=ZFxJCWiddpjHXwjZl0+KmFzpCZFLZeujAR90zPCt0CU=; b=CQu6kYQRzGuhy6y1EpKoCtMfTMME4uIWsbDNuyJ20U3FwYcj2gur9g4QVpMwlmRr28 OPqfSA2NW6x7XlTXy3ohcE2BGttgY/W6hsXLjJrIW7dqEKSFKR0T/WiBaqXbgaBuwVED jD5QRBiXqX4FgIih0T54KyeP3w9Su5jdgLOwA= 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=ZFxJCWiddpjHXwjZl0+KmFzpCZFLZeujAR90zPCt0CU=; b=Ya/RskuYr0SZku2rc8BeQYjuz+2KlBAHWFyvuaQmqa/AQ2MZfPrvmFAKeVw1ncZROh J10atP7/vCNO5HmMDGvxmYjg5ZhcM2lQ8T9qtXqGk5da5JjSupblyTQvpyExxA9wmo5C zrf3lmI+ZwpqU3w/mfsDHngKSSa2ExXHlRG0AFJvSf80TazL/AM/67hfGCLFNHqXdfe7 u+Den1/A2Fd6lkLdsUCaO8iHoJMwgYGL4W/LT8gu1y79R3yvkHWX+ZBF6c+eXPC2dkHb 3WKZ84JfN213nuTa/dw/TF9/PEBgN7Uoh0B81ISHbGjxZQxOMkAc6xzcksjqfF2ZttV9 K22w== X-Gm-Message-State: APt69E0gYO8Tc2pVaEQV3wMAb7LYi6w0y4rYT1DvBB/xyi77z4Kt4caI lT98+x693ML32VKVyc3izUlSkg== X-Received: by 2002:adf:94e3:: with SMTP id 90-v6mr2697249wrr.110.1529092516621; Fri, 15 Jun 2018 12:55:16 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i10-v6sm3001493wmf.4.2018.06.15.12.55.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:55:13 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0DF4B3E0F3C; Fri, 15 Jun 2018 20:47:09 +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, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:46:52 +0100 Message-Id: <20180615194705.28019-42-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-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::241 Subject: [Qemu-devel] [PATCH v7 41/54] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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é --- tests/docker/Makefile.include | 4 +- tests/docker/dockerfiles/debian-apt-fake.sh | 46 ------------------- .../dockerfiles/debian-powerpc-cross.docker | 39 +++------------- tests/docker/dockerfiles/debian8.docker | 3 -- 4 files changed, 7 insertions(+), 85 deletions(-) delete mode 100755 tests/docker/dockerfiles/debian-apt-fake.sh -- 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 -