From patchwork Fri Jun 8 12:33:06 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: 137979 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp839589lji; Fri, 8 Jun 2018 05:58:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIoDih9Cbdf19Z23I6Wn+6lOAQA84dwO0M5rxVKAOYOXsBFE2BYzcCOWx66t++BpIdIU992 X-Received: by 2002:ac8:2e25:: with SMTP id r34-v6mr5695745qta.341.1528462705602; Fri, 08 Jun 2018 05:58:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528462705; cv=none; d=google.com; s=arc-20160816; b=nAbUnFLvvhAinOIcIG7Zf9ebo0lviluG3lit12bn9UAJbAmYjDyKAHxpmqGjqYzTrj JWAor1FvAEpaBVI3sp7JXH92dnUDL85xMiXZxQYtMHNMAuJVaiVGgLtxYfq2m5cpDJtD eB8l2a+ZnSXQoYG8/ALbUuXQUoiZEGKPYfpopg6QHL0+QSn6QhtQ98qGPfebrdI8vtlq +fKBV9Bowy3ysqzuBSHr14K7KX6MwSXlOEAkRa20kL7HV2MfMJ83AH4TY4IbtHLTxrD2 OMYVo7mFavCl3nPbeGE9yq2whKXtwlVAsLkirxZs+nhnma9wpz7jAXtCijvupjVV3aBv Vptg== 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=W4kg4LFySTpTjXbzZg13VwoR0XpgGd9it7YLeH1MaK4=; b=N5yJymgP7mzexC2xlraLkP0K/4B2cIdalgsTGFwatwM7ZXzOKhsEV+2LWEjC+VWqwf MLYKVLtUB0/q2+hAESka/XzzX5JIErgaI/YyIhev3m3Y2gozWF5B80ptVXjHcZ2L5K+Z KPFMiPFF4XlgKgP/NK03XiHCvUZNxcTicQZUixbtaXQwknUKvQFk2OsL4e4X1qJVNVZQ 90IenMnIwpwsWyWiZ5RPRa1/kttf9ztHau/dLzvRn0y0vI2BLzV1/JxcGfymjB8b6hxy z4aZwvhfnaB458sTB1oG3cHaI1bzSthtj241G4Irg13qVIOjafIGzMPMBKSeYPz2evSb 5xjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BpQlZorq; 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 t24-v6si5368588qtb.99.2018.06.08.05.58.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Jun 2018 05:58:25 -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=BpQlZorq; 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]:35493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGyH-0005BQ-3u for patch@linaro.org; Fri, 08 Jun 2018 08:58:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGfo-0005pX-Iz for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:39:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGfn-0000yv-4Z for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:39:20 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35847) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRGfm-0000yR-UG for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:39:19 -0400 Received: by mail-wr0-x244.google.com with SMTP id f16-v6so13263094wrm.3 for ; Fri, 08 Jun 2018 05:39:18 -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=W4kg4LFySTpTjXbzZg13VwoR0XpgGd9it7YLeH1MaK4=; b=BpQlZorq8BUvYrTFH6W59xIWvnfrlO8dROgn6k3fKQ9jo1UKMB0JSBs4+vBqn3Vv+w E3tpsK8xlxWvOoqY32FYkriTEaVefMg8yYVeU1dvSLTM/cIfTW4RzHsyAoTL8FhB+EeV FhSWvbd8r8l5srh/em7DHYoVCRDgoxTLtM4kY= 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=W4kg4LFySTpTjXbzZg13VwoR0XpgGd9it7YLeH1MaK4=; b=YqDjn9YigvDIiA1c8wwZAKXhdVl3DroP9vtqFwv9HaoVF4aOCAIptTnKHaBSbbDd/N ix7UxIyqQlK3prTyFZnrJfWzXIhmY89HrhW9x01c4WhwVLUAzqxERibIcTKLCbagic1k smGXVguavY+wGW0RyepUAFw23IBdWCVRY5XkKvOIIdKrQBbyytnZCue7Y51wq+orIwMw Ho082/jpV3kX54UE6HauU9oQyV24HiWyFrRcGcf8fs015xDD3dYy+EkMfoQu2L+/pHbC 2rRpaICWaOQU/UsKHi7gzMunRuumFDc6KCFeNjJAizam34tCJVXnqWjkkYsOTDehu3b0 m8DA== X-Gm-Message-State: APt69E2RHwUTwca+zcrlLlTy7TZb65uk9S8q845dpBRLmpOK9bZU1kxL j3XHJN830kz7KEHgWY06RW+kSQ== X-Received: by 2002:adf:9769:: with SMTP id r96-v6mr5264733wrb.57.1528461557773; Fri, 08 Jun 2018 05:39:17 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c201-v6sm3667073wmh.18.2018.06.08.05.39.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 05:39:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5356F3E0E13; Fri, 8 Jun 2018 13:33:11 +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 13:33:06 +0100 Message-Id: <20180608123307.24773-49-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608123307.24773-1-alex.bennee@linaro.org> References: <20180608123307.24773-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::244 Subject: [Qemu-devel] [PATCH v6 48/49] tests/docker: prevent sub-makes re-building debian-sid 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" This is a bit of a hack but having ensured Debian SID is built at least once in the top-level we don't need to do it over and over again. Perhaps a better solution would be to have docker.py spit out the dependency if a base image is too old? Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 6 +++++- tests/tcg/Makefile.include | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 78568d7c61..3393e9f97d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -63,8 +63,12 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe # Debian SID images - we are tracking a rolling distro so we want to # force a re-build of the base image if we ever need to build one of -# its children. +# 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 diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index 4851df0951..951f40c28d 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -39,6 +39,7 @@ 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) \