From patchwork Tue Sep 10 08:43:29 2019 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: 173484 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5533476ilq; Tue, 10 Sep 2019 02:21:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzcs43JigAS1oNnUUiveAgKbY+28+eAz4fKWcDKvyOfYji/Uw2Izei1cdrtanxtocN08i5w X-Received: by 2002:a05:620a:79a:: with SMTP id 26mr26949026qka.55.1568107266099; Tue, 10 Sep 2019 02:21:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107266; cv=none; d=google.com; s=arc-20160816; b=REbstrL9fr27B4Ilspo3HgqZZQfAaFIzSUxJLvNK0Jkcb7cW0s7CcWAmVr4lQEhpYR R0EH8ViB6JHBDJTeMqKd66P8dgFDUbKt9XcqbxYrOf7WCAL//iK/KO9opHVGYDLviibw umsmu0A4VmJbYCk2W8R163lZS7h+tlBW5XMCApvav0VYK5GUpOLgI485EH7hn4WYDv1z hA3cm4unG3LfzuUq9mIjtm2O0gdZUtdkMQLYhv5uGQ/EehAVQZhQoX+nnUqbsPGr0YNw zjgYFyu39Dv8e3VKDw+qL00PJAhrdAZIDZtYOYpySc/Ut62114dTxydQ62R7xHdLtNrS XC4A== 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; bh=PsQJeErI9+aTg6zkfqahDzJy6pOKWXrb4kmWb+mMXOE=; b=GPRu+TXlXEEe8vN/vH8Z0wc2dRRRQZIMCEqO6BlkLYQaRWR3CnBiTM7+e5S+6QkMTD 8Dm7K+i0zORUQnBFvc7GgeNzZImorxwT6fkN95G9vHvHL5TeC1I3fsQetggX2HzessxN 9LkTtCYQHzCbBH3KsEP6xDCQRbtI/qPrZU/eP3FDVPaC/rECMHFFaeFyph1caqqyiOQp vTsDnB0w28vTpOSUUYVlExrkJ/ui61gdtGlJ9GIyskjgq6FVQYkEqcXVqBIGNTJiFyq0 ZokkfmdscKxDMShARhXbGt7l4ZIBevRo9J0Nyp4SjOf5EMMdWmilk2q3FpvgekFRm5mN s15Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="O/wMD5+1"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id x5si11889648qtd.254.2019.09.10.02.21.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:21:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="O/wMD5+1"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:36394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cKf-0003GA-8z for patch@linaro.org; Tue, 10 Sep 2019 05:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38938) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0Y-0004YV-41 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0W-0004nQ-QJ for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:18 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:36122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0W-0004mn-Jf for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:16 -0400 Received: by mail-wr1-x443.google.com with SMTP id y19so18484841wrd.3 for ; Tue, 10 Sep 2019 02:00:16 -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=PsQJeErI9+aTg6zkfqahDzJy6pOKWXrb4kmWb+mMXOE=; b=O/wMD5+1WTXokZBdczfjwraApWBaEa0Fpf3LQbjqGZ9FozH7/pq6fVFC21vqcLJTgB 2pYfBmXFw3mrF5g085POAP5PfhQnqc4rsFsN5ogpF07wqPWR+BbIAYIMnKXSlcrWwtkx puUp3vpMZeZg8RZv20ZK8Oni0aX5PTU3Nd1TUCJJcrjL+5cv2F+lv7MO4j5VmSGI7Ott yX0k3Psw7zaCjfSrUyhYI4GikO6JuKMeBLVvDzrvPXHIPrEO2whwjL3v3yhd0tNmEfiN dPBQzmbZHrmAz85HZCOrtqFskRXbDfRmWI+At6CzlkE3F5Voui6jfiVc9bRM9YvHkyuL XMiQ== 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=PsQJeErI9+aTg6zkfqahDzJy6pOKWXrb4kmWb+mMXOE=; b=oeO6gOuE/ZVbgZHgnZUWLpgfc25Xab9jgmNYt3AX44Fu3q/VbSjinN5I/6hr9Fs2cG 4f2KACKd7a2F+OS097XkPhKymVe6p4uur+6FTrHzywrVW4psJRwY8W1NFfHzyzr2NLGu ZqrYUBP6qB8RgK0v8vXDSWfqhD7RX/QgTT1bhDdXO8UoueGZqD9Kj7ElP+1NcFMBtPZA fIh7ckxjQy+5hP847mAz/v0DBKsOB832bRpAUQMvh3z6/cU21IzwPRNBiMr8ldKCFmKC DBg7mIx7Ft6zX8NLN1kAE9Xdr3Rx3q759fnfHgAZl1wm9s0qHGdjF8iaD3GIn0+KIFkU xF3Q== X-Gm-Message-State: APjAAAV7kFIi7cOuZxEoRqKpzOtSBMIadbt0N2Dw5B7SXa00Lk7mwB1J rxtyHOZJzgfkFFCD0eNN/WfmMQ== X-Received: by 2002:adf:dbc6:: with SMTP id e6mr8557882wrj.149.1568106015296; Tue, 10 Sep 2019 02:00:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b16sm25660254wrh.5.2019.09.10.02.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E0CA61FFAE; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:29 +0100 Message-Id: <20190910084349.28817-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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:4864:20::443 Subject: [Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Jessie has entered LTS the powerpc architecture has been dropped so we can no longer build the image from scratch. However we can use the snapshot archive to build the last working version. This now only lives on an example of setting up a user-cross image as at least on x86-64 we can use the Buster packaged cross compiler for building test images. Suggested-by: Philippe Mathieu-Daudé Cc: David Gibson Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b6c04059502..b06716ff71c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -71,7 +71,8 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker $(if $(wildcard $(EXECUTABLE)), \ $(call quiet-command, \ DEB_ARCH=$(DEB_ARCH) \ - DEB_TYPE=$(DEB_TYPE) \ + DEB_TYPE=$(DEB_TYPE) \ + $(if $(DEB_URL),DEB_URL=$(DEB_URL),) \ $(DOCKER_SCRIPT) build qemu:debian-$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ @@ -130,6 +131,7 @@ DOCKER_PARTIAL_IMAGES += fedora-cris-cross # 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: DEB_URL = http://snapshot.debian.org/archive/debian/20180615T211437Z docker-binfmt-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user diff --git a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker index 6938a845ee2..83749b0abb8 100644 --- a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker @@ -8,8 +8,14 @@ # debootstrapped qemu:debian-powerpc-user but doesn't need any extra # magic once it is setup. # +# It can be used to build old versions of QEMU, current versions need +# newer dependencies than Jessie provides. +# FROM qemu:debian-powerpc-user RUN echo man-db man-db/auto-update boolean false | debconf-set-selections RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu + DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu + +ENV QEMU_CONFIGURE_OPTS --disable-werror +ENV DEF_TARGET_LIST powerpc-softmmu,arm-linux-user,aarch64-linux-user