From nobody Tue Feb 10 20:48:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529094027488573.4210104157975; Fri, 15 Jun 2018 13:20:27 -0700 (PDT) Received: from localhost ([::1]:49151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvCs-0003Cr-OV for importer@patchew.org; Fri, 15 Jun 2018 16:20:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuoi-0000ko-7Z for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTuod-0006oj-Jp for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:28 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:46517) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTuod-0006nb-6C for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:23 -0400 Received: by mail-wr0-x243.google.com with SMTP id v13-v6so10956921wrp.13 for ; Fri, 15 Jun 2018 12:55:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g11-v6sm9382817wrr.46.2018.06.15.12.55.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:55:16 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B32D73E101E; Fri, 15 Jun 2018 20:47:09 +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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vua07p4/u4F7CHXsCSSR7SBJhY05ygQLrhUxMuJgSEo=; b=Vofw8+d9WyfirmbVy5xE03II90Vfa00e039UMQP77zzqxFMN+KPuuRcK0VXNY6WVY5 Wl6eNt1LAJtEUY/eJ9OMjk9l2ANWe9Xpgr7VRR5qjmvWJUr+HVhi5sXNQmDIIXY54U6w aw4mojrAwLqFp6af0zSbVSo0JXHHWeop/cIJo= 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=Vua07p4/u4F7CHXsCSSR7SBJhY05ygQLrhUxMuJgSEo=; b=f7AcyxAUNTWSFJd9K04pfiFKUzS3nC8YW/KVlA/bHGdISiyXXgNUf5CVETOD9xiRAH zzV4pAHG/PJMTgU5n0mtkfcTpdleAlBCo/FABdu8zv48sa/pxU1CM0lsm9DtLvRM2lGz lM8/92r6HRjgW6H/u+4qUwQUjwvBK9rsv68u3EMFfzb1FUFqJnqzH2XmPaSFPljgG5a2 NaRNEKYBScz/CdAv10EBrsx2si3WODzsYv5m0i3IOdTcr4eLDpZoF4XfGYO5qdvRltz4 QXMovYhp6D+0Vh+U80Ls6RJcDb8FsLLJLU5Ey0xIk8kPkYs189/Dl4y+BLL+hvj43GJA FYRA== X-Gm-Message-State: APt69E1TzOfGF/3ywOi9Dm6hEGOB/bPCH/FJjC3H+MVokbU1VOHIIG75 RAQWRZGDkej6dITJD7u6ILdLvA== X-Google-Smtp-Source: ADUXVKIBJJKbLXC0tBzXGp4ZHTfuyrqtQdkcTpmhXe9InUorHIiNNRW0OcVQ8P4mg1lsDLmFX1jQeA== X-Received: by 2002:adf:eb0c:: with SMTP id s12-v6mr2928110wrn.174.1529092522084; Fri, 15 Jun 2018 12:55:22 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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:47:00 +0100 Message-Id: <20180615194705.28019-50-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 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:400c:c0c::243 Subject: [Qemu-devel] [PATCH v7 49/54] 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 This just gets confusing especially as the helper function doesn't even take into account any extra files (or the executable). Currently the actual check just ignores them and also passes the result through _dockerfile_preprocess so we fix that too. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c83fd89985..2593a12d04 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -201,8 +201,10 @@ class Docker(object): =20 tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=3D%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=3D%s" % (f, c)) + tmp_df.flush() =20 self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \ @@ -317,7 +319,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 +=3D [_file_checksum(filename)] + cksum +=3D [(filename, _file_checksum(filename))] =20 argv +=3D ["--build-arg=3D" + k.lower() + "=3D" + v for k, v in os.environ.iteritems() --=20 2.17.1