Message ID | 20180619154435.18898-52-alex.bennee@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="MF0pIfZ3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 419CM94cCpz9s37 for <incoming@patchwork.ozlabs.org>; Wed, 20 Jun 2018 01:59:17 +1000 (AEST) Received: from localhost ([::1]:43407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fVJ2J-0001UC-AZ for incoming@patchwork.ozlabs.org; Tue, 19 Jun 2018 11:59:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVIvD-00042l-7t for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVIvA-0001gb-HO for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:51:55 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:32832) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVIv6-0001cr-LJ for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:51:52 -0400 Received: by mail-wr0-x244.google.com with SMTP id k16-v6so193613wro.0 for <qemu-devel@nongnu.org>; Tue, 19 Jun 2018 08:51:48 -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=p/TLenLr5ng/OG2TI1YEW8pX1dn0HpWL/zzqhS4I8zY=; b=MF0pIfZ3OQXexTRhQmBO/nUMOMEYLz6lV6mDLtrY5aFtSmAYO9Nf5N8LfLZxUVB1li iCe1g4H4OMh+EYJ41p8tlEa3/171ZNIZaJMyZDxHeJIjMLGQ+W4HRpDlqbI8zvQ/Sy4R 5tVPXYqWQ8CLuQxuY4cTCet4FnZXwYFDOlnY8= 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=p/TLenLr5ng/OG2TI1YEW8pX1dn0HpWL/zzqhS4I8zY=; b=Q4Ui9kFSaEXRo7GBdN+Yk+TF2BWKU4aPo5PsuFHilCz3+9ohY8xUViV/Y1+LFmOZCw xpjxy7WtFC6MEdttVpm3XVT8hwR3/op7VF2gs1IRYuwr9Lss2xoIvC2tQIlflpbOom+4 DViuZlq34I14k3EP/GNiydGYiFE7d25Gh/PeqZlVK0vkDGKSB+tYak+uAqPFJqTfzv4i JsDkeJmGN7s0ub7Q21D7EGAiF8IXvC3dwYa3mauhloDU1pCYmoqym6l+iFWN5YOApZHG HvkDToUicvJNxSmuopjo3vDHJxqJVd1UL0TINgFn1HbyzIWd7CTX2/3lfUHwsmXxCU5/ ec6A== X-Gm-Message-State: APt69E2M7misQdUWcRFAqfZmuqRyi0fzqZwoPsszuQ65REEL0L7zSil9 oLIczPUhJCoPqHcD1tBOcF4CuQ== X-Google-Smtp-Source: ADUXVKLuUC7u4yFowJGDo4ipR8sq9VGZ0X2FqYkWMkliyuI9ETJB0+5v8Cer3WLZ1ULF09RZNJKzRA== X-Received: by 2002:adf:8bdb:: with SMTP id w27-v6mr14837424wra.169.1529423507473; Tue, 19 Jun 2018 08:51:47 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c18-v6sm31425wrq.17.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 0862F3E106A; Tue, 19 Jun 2018 16:44:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:30 +0100 Message-Id: <20180619154435.18898-52-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 51/56] docker: docker.py don't conflate checksums for extra_files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/56] configure: add support for --cross-cc-FOO
|
expand
|
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index e6685f6d81..0a0155c941 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -203,8 +203,10 @@ class Docker(object): tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % - _text_checksum("\n".join([dockerfile] + - extra_files_cksum))) + _text_checksum(_dockerfile_preprocess(dockerfile))) + for f, c in extra_files_cksum: + tmp_df.write("LABEL com.qemu.%s-checksum=%s" % (f, c)) + tmp_df.flush() self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \ @@ -319,7 +321,7 @@ class BuildCommand(SubCommand): _copy_binary_with_libs(args.include_executable, docker_dir) for filename in args.extra_files or []: _copy_with_mkdir(filename, docker_dir) - cksum += [_file_checksum(filename)] + cksum += [(filename, _file_checksum(filename))] argv += ["--build-arg=" + k.lower() + "=" + v for k, v in os.environ.iteritems()