| Message ID | 20180608123307.24773-49-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="BpQlZorq"; 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 412Msw45KRz9s0W for <incoming@patchwork.ozlabs.org>; Fri, 8 Jun 2018 22:58:44 +1000 (AEST) Received: from localhost ([::1]:35493 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 1fRGyY-0005BQ-80 for incoming@patchwork.ozlabs.org; Fri, 08 Jun 2018 08:58:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) 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 <alex.bennee@linaro.org>) 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 <alex.bennee@linaro.org>) 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 <qemu-devel@nongnu.org>; 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-Google-Smtp-Source: ADUXVKI28Dyh/0d9WG+6JflbcsMGWmHEFYbnbJVHhQZLTaitEsWAqM2ClsoNO0+/lHkPdHa25LnnDA== 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?= <alex.bennee@linaro.org> 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 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] [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: <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: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
| Series |
fix building of tests/tcg
|
expand
|
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) \
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 <alex.bennee@linaro.org> --- tests/docker/Makefile.include | 6 +++++- tests/tcg/Makefile.include | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)