From nobody Sun May 5 12:09:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1568022576; cv=none; d=zoho.com; s=zohoarc; b=UiKZlgDznoshzjpFlVR9xly/mDqMzIcNNz7HNIp3AWg9CLwJ0UQcsZTHzucUgMB2CfpBknIkvzve5o1UGH0LnmxfzfbbSFfCbPOQX0vwc8AYfEfy2ghdADsNe5/TosEfVtvbSum2EAE1g9TuVtK86fK4btpVmuMxk66gciJJEq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568022576; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=bULc1zGTtRFCu6ZKD/sIGS3tUnWL3tf9I0v3qKoMIdU=; b=cY9scRt61HLBUqophIpIjoH7+TUaorWtRan0O1/fudAlEfreUo6RwU2iZkswk6fzkH8rneqvP+oSdF7R0KJ/gvrRv97b07bLg77qx29fq+OEnDTqXlVRZd1M5kgn0PhniTQR6x10La7qY7zeMa7y0ds55IqJV5/0UfgYh2zwx2k= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568022575708611.3407643357156; Mon, 9 Sep 2019 02:49:35 -0700 (PDT) Received: from localhost ([::1]:53526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7GIZ-0001EC-32 for importer@patchew.org; Mon, 09 Sep 2019 05:49:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43240) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7GHe-0000jh-Qe for qemu-devel@nongnu.org; Mon, 09 Sep 2019 05:48:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7GHd-0002zP-8H for qemu-devel@nongnu.org; Mon, 09 Sep 2019 05:48:30 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:44161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7GHd-0002yP-0Y for qemu-devel@nongnu.org; Mon, 09 Sep 2019 05:48:29 -0400 Received: by mail-wr1-x434.google.com with SMTP id k6so934105wrn.11 for ; Mon, 09 Sep 2019 02:48:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u22sm27543692wru.72.2019.09.09.02.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2019 02:48:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B873C1FF87; Mon, 9 Sep 2019 10:48:25 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bULc1zGTtRFCu6ZKD/sIGS3tUnWL3tf9I0v3qKoMIdU=; b=FgTom8isNtMeuTDq2Jlz5Ec7dW/VOqNqYsDBOWx8zJHLvUiDJ7bhK+MsDlkhPyTKpZ 1b9YPzM9xtXafE6ZeZ+z41JnLmNxGuPuFl7S93U+TITZlGQz1JviLve3EBmZEyZwPpnc g1yBZ7C9M0nrAnbWntabLtkE8DmVevxngn4xOf5QlDDhAFblMRhLUnB3Qw2BEx5NXGs8 a62OY7bQ/4NPCC9kNKltF2vLrmiVhrxv+FO1bZKoj/Cz47+RTgcNXbnsRsxhtPFL6B8d ArYgovAIiuK0CgyG+6QmcIi8q5sO5J9x/A6GdpFqw8rrAk77B/VRxVrJbemqiv/csD8x AybA== 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:mime-version :content-transfer-encoding; bh=bULc1zGTtRFCu6ZKD/sIGS3tUnWL3tf9I0v3qKoMIdU=; b=CxRk9WA9mGxxiF8zuVoC/TlcvYfHLmYuorm7tekGq2AL8sRtD3BjtOIcE3O/OldPoY 6cbCzF39SwjeRvWiU9TgGWoLuyFKdnr4la+BG4CE4X9Cp7iEB5aFNi1lLWz741qj10cM ruH+k0Z3GU31G0DNsi7/YjI9KOn4aIVeoh9rknQetaxcSmTu6Am4hcRAQbp88csQG1gG VhtjjY4jrTvvAiJCtoRein2Ho+dTZj2gieNZZ0WZkIb+USxh8U5PEZBkvGKI0VU6A9ia yEvLISD5T9vjQ9H57a+GGgkKg1vZCkUa0+zIYsXy9s1TKp5L1rScaF5SyFwJM8HYvjUf beBw== X-Gm-Message-State: APjAAAXKTyAvYSyVLBJuKDLYXEiuWColybB85F8Sg0oxrZKhoO9VfxjX 91FWNGOcw5YeNKbzV0+FYUj9BQ== X-Google-Smtp-Source: APXvYqx+zpOZ7CMtTTLEWJa+mk4fevJeu14BuYtiwMeZPGbsGzzj4dP/FDKpQFw0tYpeOw4JXcj1RA== X-Received: by 2002:adf:dc89:: with SMTP id r9mr17696817wrj.139.1568022507058; Mon, 09 Sep 2019 02:48:27 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 9 Sep 2019 10:48:16 +0100 Message-Id: <20190909094816.1970-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PATCH] tests/docker: update Debian Sid image 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=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) While we are not currently using it we might as well keep the image for later usage. So: - update to a more recent snapshot - clean up verbiage in commentary - remove duplicate shell from a merge failure Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/debian-sid.docker | 24 ++++++++-------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dock= erfiles/debian-sid.docker index 513459ca7f8..2a1bcc33b24 100644 --- a/tests/docker/dockerfiles/debian-sid.docker +++ b/tests/docker/dockerfiles/debian-sid.docker @@ -1,25 +1,19 @@ # # Debian Sid Base # -# A number of our guests exist as ports only. We can either use the -# ports repo or get everything from Sid. However Sid is a rolling -# distro which may be broken at any particular time. If you are -# unlucky and try and build your images while gcc is in the process of -# being uploaded this can fail. Your only recourse is to try again in -# a few hours when the repos have re-synced. Once built however you -# won't be affected by repo changes unless the docker recipies are -# updated and trigger a re-build. +# Currently we can build all our guests with cross-compilers in the +# latest Debian release (Buster). However new compilers will first +# arrive in Sid. However Sid is a rolling distro which may be broken +# at any particular time. To try and mitigate this we use Debian's +# snapshot archive which provides a "stable" view of what state Sid +# was in. # =20 # This must be earlier than the snapshot date we are aiming for -FROM debian:sid-20181011-slim +FROM debian:sid-20190812-slim =20 -# Use a snapshot known to work (see http://snapshot.debian.org/#Usage) -ENV DEBIAN_SNAPSHOT_DATE "20181030" -RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [chec= k-valid-until=3Dno] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_= DATE} \2%" /etc/apt/sources.list - -# Use a snapshot known to work (see http://snapshot.debian.org/#Usage) -ENV DEBIAN_SNAPSHOT_DATE "20181030" + # Use a snapshot known to work (see http://snapshot.debian.org/#Usage) +ENV DEBIAN_SNAPSHOT_DATE "20190820" RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [chec= k-valid-until=3Dno] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_= DATE} \2%" /etc/apt/sources.list =20 # Duplicate deb line as deb-src --=20 2.20.1