From patchwork Thu Jun 21 06:25:50 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: 139499 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1707081lji; Thu, 21 Jun 2018 00:10:11 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLpNjXHETqPluZnrfnk+r9gwPUAgyUaYSslRI4c9cQsmhO47YTnsc6YFI+bHkILHHdboRX2 X-Received: by 2002:a37:192:: with SMTP id u18-v6mr3293879qkg.254.1529565011213; Thu, 21 Jun 2018 00:10:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529565011; cv=none; d=google.com; s=arc-20160816; b=oO2HjSmHeKk1xzRZbQNIxWPH0+E7alGsR/qYwu25jC6rj5A9xF8BG3/Mt8Xz7Tq+ph jElWVZzl/HU9ec/TscGhFRJXrUBdsveWc+D97TiBYjjjQu9VfhCX2bvmhkWbw/+KNjjX A8NcyhIqOHMX+2GYNheZrPM0otBar/iYBdGiV/NluIj42L1NKhpScDCSyLv6jcTePYgN 8QMenRqPF8asFdbSv1+blH0dskY1dRaKoLXRoP/SVYvtoP1yQUU17HJqLTLZkY+U4Pbg 0ZaPNU9pfciDmWGGJw2VuWy5vI0bd5Vm+4+uI2sW7UOXHJ+7qmmE6ygJu22C1FbMX1ua iqxw== 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=PRw8efcbUzZG50+uSoV80uU12dm80EIuSIUiGnvprsz6OiFHHwf66OaVCPIekzBgnr 7h2w6k89ndx0pfnB6VK/X3kQ4g48hyjPHS5bGfiBtdWp5zDcYQ+Kt8mlL/aziw1+hGSS +1o8E5tbnQToZqGn77bdvS7lo3/j2fwMnZt3F8VqL9/yzMSdXKIx7kt3Eg0jmw22xvPK qEAOq/bApipDBDVNrDITaq0EaKNtGm8Tcvh8we3nOBhNaSv4ownWERFFt6ze0ham0qwf 0UWAFyfKDITaTbeC+n7i/LNpDuEET5FVuK5xoKSfo57ooq5D6wLmKJfbdHbMAkl1olr0 CeTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IEsJ2MQZ; 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 n27-v6si4221811qtn.184.2018.06.21.00.10.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Jun 2018 00:10:11 -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=IEsJ2MQZ; 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]:53484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtjO-00022T-Jm for patch@linaro.org; Thu, 21 Jun 2018 03:10:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtbS-0004MK-O2 for qemu-devel@nongnu.org; Thu, 21 Jun 2018 03:02:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVtbO-0008J3-RU for qemu-devel@nongnu.org; Thu, 21 Jun 2018 03:01:58 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:51032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVtbO-0008IK-GL for qemu-devel@nongnu.org; Thu, 21 Jun 2018 03:01:54 -0400 Received: by mail-wm0-x243.google.com with SMTP id e16-v6so3268062wmd.0 for ; Thu, 21 Jun 2018 00:01:54 -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=IEsJ2MQZ8Tv1F/X9+cGlvQME62JjJiDGJ+HDvDCFij2Gq20SRYBDWKFJty04D++9ei //dsQrKCiQtpHfq7VkkEO6FoaRmZE+FPGKQPdtlXp7OBDiS8BicZQYTHRCj7i2Daq0AD 3fkMKzfZzbvbASO1wI34mQJz6+GgV1awQFBsk= 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=nEoe47Fdn3sRxA6gmXJ7s9RL8iLTP+XA/dKaGbsXodNMV0IrbU6zSKXCedxuD2pWTv gH/lYJswlr1nUuDGA5KyUrXBxKbdbLhhA6Xxou+uXyo38xl8ItAqiheXsNmpsvEU+GEq aZrlM6xU/QYlaiMo4n5LexZeLQJki5hwyHGLNmZ2+O3gg5Iohl9wFNYEHAkeJxJpyH/G 31nklYCI1BJM7Tz0BuQGblaXeO4r85lR2CNpMCOzzvKQoGtuSh9RB/l+xeK1TvlQh9vk YlOOxBI0UT1d/PlKAANUtqyisUZ2Y8PK+kC7a2tO6NeMab3TGxa8M6KsAuay/wICYWf5 0voA== X-Gm-Message-State: APt69E25BWEOxNWb344TNgSshVHYsc9P/zuRn1EYUX1Zmw5//hq7QFaI DZc+IU/s2rVwi6bztx5Ryec+PBlZAAo= X-Received: by 2002:a1c:8647:: with SMTP id i68-v6mr4078842wmd.28.1529564513254; Thu, 21 Jun 2018 00:01:53 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n12-v6sm3274040wrp.69.2018.06.21.00.01.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Jun 2018 00:01:52 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E95533E07DD; Thu, 21 Jun 2018 07:26:08 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:25:50 +0100 Message-Id: <20180621062605.941-43-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-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::243 Subject: [Qemu-devel] [PULL v2 42/57] 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 -