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: 138058 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1053156lji; Fri, 8 Jun 2018 09:07:31 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKWLAeoDPHrZSeva3qIjwhMXVWKwL/jmF2BhfLlwk1ZcQrANJJKh1EfPbH8F8/ZcxrfWB+x X-Received: by 2002:a37:7101:: with SMTP id m1-v6mr5825324qkc.19.1528474051515; Fri, 08 Jun 2018 09:07:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528474051; cv=none; d=google.com; s=arc-20160816; b=0zaBPLYqTIw2NdS/u7bUDfvqnRulUOOZQUOSF7o/nG0d2mAhP1sCAH/9MoPiuOumEw exiXlY7GRlr3d1i8kzaXss71i2nFi3itNgMsZZF1w4Oir5uPVubihE54EJghImYZ6rCx afJ0uT94BK42cWZr4qbtB13lbRtiO/bSk7qxZHEOa6+DsBNVtZPLCt1scb5hm3uKDaUV sgPHWRjHUdU1Rx70CMv8Uhj8z/hjzyJicYy6O9gvU0zclHd6qYVFwB8RJL4IIBFgQ5b/ C+uNlO6Bx9hvqU4C9ttxHoTAOeXHnY6O0wsP7g3se+lMbULXi9FYAWefWBWIvKt6T2sH JzYw== 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:arc-authentication-results; bh=fRPnavj8uBJb1s75RyigzMAhfkytlJx9NZR3+CV8US4=; b=vKAyed2Y7dRQS8SdRIkXA4G1Q0q3+fCHXySn1vgjsUHVNSQgfM4LKNywo0hVkSKehG KnW45JBfYyFx+IHiw0tfx1GfHD9cXlBkEdVVJb48HFNMspSfjKZeG91yROoDDK5uCpe4 9vHyotzYxSEst/n5V6JSGLamfGn2fwMd53ovz+sydqPrs3Y4FEPA/ZZsP4WJTKw1LtaL wcKzzIFk7TVNx7eSfFr8jEbpwu4T09470z2NJpYAXb3e9lXTbGu+qstLHTm1pGHyyDzd tLhERVHL1BoZ1r9jJZiXq1ZoMpcUoCjYwdN+d9bQaZspMuS2H0a2v+lUFMQfbGP5zHAt BXUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L57goN+R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f63-v6si837309qkd.330.2018.06.08.09.07.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Jun 2018 09:07:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L57goN+R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:36858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRJvG-0002Ps-TQ for patch@linaro.org; Fri, 08 Jun 2018 12:07:30 -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-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+patch=linaro.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(-) -- 2.17.1 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) \