From patchwork Fri Jun 8 16:04:30 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: 926898 Return-Path: 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=) 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="PTMW1ZmA"; 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 412S4S4RHyz9s3q for ; Sat, 9 Jun 2018 02:08:08 +1000 (AEST) Received: from localhost ([::1]:36859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRJvq-0002Sg-53 for incoming@patchwork.ozlabs.org; Fri, 08 Jun 2018 12:08:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRJsV-0008FO-4I for qemu-devel@nongnu.org; Fri, 08 Jun 2018 12:04:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRJsR-0002sA-4M for qemu-devel@nongnu.org; Fri, 08 Jun 2018 12:04:39 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:46900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRJsQ-0002rb-TZ for qemu-devel@nongnu.org; Fri, 08 Jun 2018 12:04:35 -0400 Received: by mail-wr0-x242.google.com with SMTP id v13-v6so13912838wrp.13 for ; Fri, 08 Jun 2018 09:04:34 -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=vAhz3Edy7slFZZwtrW7UOVkP4Xafk1grhNhHOs1SCok=; b=PTMW1ZmAtM3ACo9LHmlyg5KYn6kRBuiaNKChmPCENWA7nq+4OKrO6Gw858Si+CuZQ8 yQdZbrp5ecXLEhaJxocpWUvX8dFo3ZBiwEs+yFhrPVqnOr1Ym3TbL91S0P/F6pL6d4Q3 T/YWwe7109ecC6aoH1be8P6tM02o4ikUzQc5Q= 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=vAhz3Edy7slFZZwtrW7UOVkP4Xafk1grhNhHOs1SCok=; b=tYtCXDPBc7P2W2X0KCdnt5hSnHcXUA35Zgnsfnn7h+lUnfrq8vLBtsDfPZJhbciECY lshe0HRJIe+AVEbneSFUiwCf4ZxGxL1Gr6sy/nfiuTnbLwBnrduoigGLkLwHZNh5aP/U Tte11grGD+EbSwv5H/fy+20G4jc2vZPP4Sf1nfGvHyvzTi2kYxGwoaX5/Nq+RU3OxzOg 5Xnm8piHBwlbMfcXjNpCGrQN1AYBqssLju2TkuTnKaB11jWZN4tTPMqsa1pAPYdQxQiU wNzK5iv1Ix2MUDDSSHwY8LGB+Mutxs0eZnKr6zbFkef9mXfwi+tqD02F3KMMGXEyyOhG HcUA== X-Gm-Message-State: APt69E219IaNHbKz6wVXjzvxo/Ienzk8i/WQFDeN2+TlCAASUtskgn8l UIRNKLvI7pPF02rswptSXQve1Q== X-Google-Smtp-Source: ADUXVKIh1D9FZCSnk38HjK/y/tOauYxlcsEwRPvXWxARJXySK9+t/3T0iRKdktc8B29JtgWuncuHxA== X-Received: by 2002:adf:91e5:: with SMTP id 92-v6mr5582598wri.124.1528473873803; Fri, 08 Jun 2018 09:04:33 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r3-v6sm36315530wrj.78.2018.06.08.09.04.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 09:04:32 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A81F03E01A5; Fri, 8 Jun 2018 17:04:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=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, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 17:04:30 +0100 Message-Id: <20180608160432.8734-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608160432.8734-1-alex.bennee@linaro.org> References: <20180608160432.8734-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:c0c::242 Subject: [Qemu-devel] [RFC PATCH 1/3] 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_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée --- 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 37bfa98005..80efa641c5 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -200,8 +200,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 + \ @@ -316,7 +318,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() From patchwork Fri Jun 8 16:04:31 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: 926899 Return-Path: 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=) 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="hG9lfuFJ"; 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 412S773bklz9s01 for ; Sat, 9 Jun 2018 02:10:27 +1000 (AEST) Received: from localhost ([::1]:36886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRJy5-0004Yv-43 for incoming@patchwork.ozlabs.org; Fri, 08 Jun 2018 12:10:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRJsV-0008FN-3c for qemu-devel@nongnu.org; Fri, 08 Jun 2018 12:04:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRJsS-0002ui-NQ for qemu-devel@nongnu.org; Fri, 08 Jun 2018 12:04:39 -0400 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:43056) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRJsS-0002sy-Hu for qemu-devel@nongnu.org; Fri, 08 Jun 2018 12:04:36 -0400 Received: by mail-wr0-x229.google.com with SMTP id d2-v6so13898758wrm.10 for ; Fri, 08 Jun 2018 09:04:36 -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=cKWMs3nz6qhnG+8dxg8o1VTXwohj1ZlM932WlLkaXRw=; b=hG9lfuFJnQUMugMWN2E+3KQn0z+yc6fhPZMlUb+gUtp5dC4ykj0sR9Gx8Yz6odMUbA QLEaprrnx6tsyvTxb2pKJizPOPiXcas+kB9xW3nUtnyTtkUSeD6x3Qphum9XmQHbJQyu qWW+OvljaxIWaLkWQtsLoeZDTSfXXuP08jG+U= 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=cKWMs3nz6qhnG+8dxg8o1VTXwohj1ZlM932WlLkaXRw=; b=tPsNimDpQ8YMeAoh7QOksuBd9lOJ3zMeyD9Ms1SovWlsxXQy5rBI6X9RCLtaz7UEf+ IHFjT3WfRFHviHkGFAposQohIHqtyCPR7k6EB+CeZ0whbX6CHp0s6uj6xs09Yg39Nu8R bc9s3DpZzjQ59//qHe+b4xMnMsXn9PrcN2Hi4znBPSTJEeifDN32cToLZD9ntCaxgX0p QzW9Ldwft+fHbLScnM1Id/nb3ZVk6d6hfYjyt8DIgJLmIruGaZu69bfFfo+I7xHaky4r h+qggtIZKlJYeYbZ7M0iOKaLfO+wprcXZd2W5g7zUnDl8YIZ1pG5dUm+Kuft1z4PqkF9 5p4Q== X-Gm-Message-State: APt69E31KBJGXaDbejeYGw2EW42tIfSEkOcvxkrcjWBLHNppna1lVCkc iJgKK5lPZNb/a0WoTcuPmdO9Pg== X-Google-Smtp-Source: ADUXVKKyoW2uf0eH1Z+/UZ3zEalCG9bxZScwhxX6yiRk/9BDoMBhmPpIPZAm8xPzHAO3sVwGjTJ32Q== X-Received: by 2002:adf:a4cf:: with SMTP id h15-v6mr5769924wrb.130.1528473875439; Fri, 08 Jun 2018 09:04:35 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j21-v6sm1253469wme.36.2018.06.08.09.04.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 09:04:33 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BAD2D3E01CA; Fri, 8 Jun 2018 17:04:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=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, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 17:04:31 +0100 Message-Id: <20180608160432.8734-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608160432.8734-1-alex.bennee@linaro.org> References: <20180608160432.8734-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:c0c::229 Subject: [Qemu-devel] [RFC PATCH 2/3] dcoker: docker.py add check sub-command 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_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This command allows you to check if we need to re-build a docker image. If the image isn't in the repository or the checksums don't match then we return false and some text (for processing in makefiles). Signed-off-by: Alex Bennée --- tests/docker/docker.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 80efa641c5..c2763957c9 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -441,6 +441,28 @@ class CcCommand(SubCommand): return Docker().command("run", cmd, args.quiet) +class CheckCommand(SubCommand): + """Check if we need to re-build a docker image out of a dockerfile. Arguments: """ + name = "check" + def args(self, parser): + parser.add_argument("tag", + help="Image Tag") + parser.add_argument("dockerfile", + help="Dockerfile name") + + def run(self, args, argv): + dockerfile = open(args.dockerfile, "rb").read() + tag = args.tag + + dkr = Docker() + if dkr.image_matches_dockerfile(tag, dockerfile): + if not args.quiet: + print "Image is up to date." + return 0 + else: + print "Image needs updating" + return 1 + def main(): parser = argparse.ArgumentParser(description="A Docker helper", usage="%s ..." % os.path.basename(sys.argv[0])) From patchwork Fri Jun 8 16:04:32 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: 926896 Return-Path: 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=) 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="L57goN+R"; 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 412S1g32HBz9s01 for ; Sat, 9 Jun 2018 02:05:41 +1000 (AEST) Received: from localhost ([::1]:36814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRJtS-00005h-2x for incoming@patchwork.ozlabs.org; Fri, 08 Jun 2018 12:05:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRJsV-0008FL-2p for qemu-devel@nongnu.org; Fri, 08 Jun 2018 12:04:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRJsT-0002va-Qx for qemu-devel@nongnu.org; Fri, 08 Jun 2018 12:04:39 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:38828) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRJsT-0002uy-K4 for qemu-devel@nongnu.org; Fri, 08 Jun 2018 12:04:37 -0400 Received: by mail-wr0-x241.google.com with SMTP id e18-v6so5673557wrs.5 for ; Fri, 08 Jun 2018 09:04:37 -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=fRPnavj8uBJb1s75RyigzMAhfkytlJx9NZR3+CV8US4=; b=L57goN+RUZmUC2d6+0kSLjHtqyYyogaZdgy4vbgQ78oNQbcBSpr9IGGZZf3AF5T8Do QFhmlIzx9l/xMBGenF5tdCzIl1pypKTff82Ghq0HVfle/z6DXL1uTXDWBAussw63g+sV 5WlkiasV68LsZOJmZyIgtvfjze6jA7ual9d9Q= 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=fRPnavj8uBJb1s75RyigzMAhfkytlJx9NZR3+CV8US4=; b=b+LfUm+SDK71dlKgaWaV3Si50SKuOSrp1t8A4O8yz/f05xivm+CpdxpfR/e2nagUHG FgXqVkH5cK/0apBS8ciI1MZdr4JxzKP7WrLnvfdl534q0BSMHH3qE6i7SEZe1wLniNfC vzcbrEUvDODUlClyQ6EfoDQhthmqBIreQNYHu9rs2y03+4GFTiC75Y13RGvEbP2hCSUY hYaOOW/dtoEQZbHsPBCqawpYE9AnwsOPXzYOV2hSh6P77Q4ajpe7GdhGNMQXmCXSe7+d ybFtSCdwtLG6NqrENsYFPVCzAoruwpKflEY7zKS6mV2zf4ThM1PKZyJX05SSzi4FgO6M XoNg== X-Gm-Message-State: APt69E0MRySg1yVmt2lr4qU0KHqy7BbzQZN/y7pJ12De30PUEVxlT2MN ZWrdAeYIuxYBj3ZHGHSzs+6zSQ== X-Google-Smtp-Source: ADUXVKLa024BrdRNKN8jqziNDF3n7zj2v6kyIogVeLMho8ltf/y1cMhsaymdyCm/PGAasmgzjAZCIw== X-Received: by 2002:adf:deca:: with SMTP id i10-v6mr5748893wrn.37.1528473876303; Fri, 08 Jun 2018 09:04:36 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o13-v6sm1271867wmc.33.2018.06.08.09.04.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 09:04:33 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CE4823E0260; Fri, 8 Jun 2018 17:04:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=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, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 17:04:32 +0100 Message-Id: <20180608160432.8734-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608160432.8734-1-alex.bennee@linaro.org> References: <20180608160432.8734-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:c0c::241 Subject: [Qemu-devel] [RFC PATCH 3/3] docker: remove SUBMAKE_NOCACHE_HACK for debian-sid based images 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_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Now we can conditionally make docker-image-debian-sid a dependency depending on if we actually need to re-build our image we can remove this hack and use that mechanism. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 25 ++++++++++++++----------- tests/tcg/Makefile.include | 1 - 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 3393e9f97d..2ce72de180 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -66,18 +66,21 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe # its children. However when doing check-tcg we ensure everything is # built at top-level make so we can dispense with NOCACHE here to # avoid excessive re-builds. -ifneq ($(SUBMAKE_NOCACHE_HACK),y) docker-image-debian-sid: NOCACHE=1 -endif - -docker-image-debian-alpha-cross: docker-image-debian-sid -docker-image-debian-hppa-cross: docker-image-debian-sid -docker-image-debian-m68k-cross: docker-image-debian-sid -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 + +# $1 = dockerfile, $2 = dependancy +cond-dock-dep = $(if \ + $(call $(DOCKER_SCRIPT) check --quiet \ + -t qemu:$1 $(DOCKER_FILES_DIR)/$1.docker),$2) + +docker-image-debian-alpha-cross: $(call cond-dock-dep,debian-alpha-cross,docker-image-debian-sid) +docker-image-debian-hppa-cross: $(call cond-dock-dep,debian-hppa-cross,docker-image-debian-sid) +docker-image-debian-m68k-cross: $(call cond-dock-dep,debian-m68k-cross,docker-image-debian-sid) +docker-image-debian-sh4-cross: $(call cond-dock-dep,debian-sh4-cross,docker-image-debian-sid) +docker-image-debian-sparc64-cross: $(call cond-dock-dep,debian-sparc64-cross,docker-image-debian-sid) +docker-image-debian-mips64-cross: $(call cond-dock-dep,debian-mip64-cross,docker-image-debian-sid) +docker-image-debian-riscv64-cross: $(call cond-dock-dep,debian-riscv64-cross,docker-image-debian-sid) +docker-image-debian-powerpc-cross: $(call cond-dock-dep,debian-powerpc-cross,docker-image-debian-sid) docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index 951f40c28d..4851df0951 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -39,7 +39,6 @@ ifeq ($(HAVE_USER_DOCKER)$(GUEST_BUILD),y) ifneq ($(DOCKER_IMAGE),) # We also need the Docker make rules to depend on -SUBMAKE_NOCACHE_HACK=y include $(SRC_PATH)/tests/docker/Makefile.include DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \