From patchwork Mon Aug 7 15:39:29 2017 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: 109568 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2905875obb; Mon, 7 Aug 2017 08:44:16 -0700 (PDT) X-Received: by 10.200.0.208 with SMTP id d16mr1320203qtg.69.1502120656080; Mon, 07 Aug 2017 08:44:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502120656; cv=none; d=google.com; s=arc-20160816; b=Rkqi6hL31izeZ0LYuT4+mlkljRwOlLlirErTaZEo9EG5SY+2JMrjqfN6LOTX9LAc0r jW0IXNWgbDJiw/TNSogBL9KMBGFrfTvsRBuEVMHo1O4JS/P2kOUz2vlCG/IQfPuam1E3 ulv947C4hLPz2sF3PyEEa8rp/wBztOTh1BwdteQas3g2WFhmC62+8qP0DOIfqzrvlf4E YUunVL1PcY3yAp1ooIvLGgHPx+6pzMHb79uIDxyVpt2NO+FdCp1Epp77AJrNrrNekNOK RaVtjjlk4SeVB+LDMbcX0gqFpOasDLoR6VS2eemJugtQloFMz7VxvJfvvyvmv/7dH01h QZ1A== 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=3HFch1EWRGn/6uh5F40O85V1Edv9RLZwoWa6B9YN0XE=; b=ffsEmVmQJu7mYtGEj1IxBMm8jkg7Pb7mL7iXRke0K/xY2qI7UNuw5naGD5di2LAkwm q8n/c7/IAzeMmIGPv/K7fdHMp+m5EqZFA/R3jELBtjaNdiaaF3T//bBr4LGZsb0IEXny oMpiTnTRD2XQEr86YI8kvNsUrQfE3FajLaL4RyM2gIuEzhGcoZV/cQ/ZuocZ0eIDzjq/ OzAwk38LljemrdK9ZcBUKaQi7QuJxHVHvGTlaq5Wh5MaWtSiOKcPiZbrHQzQ3JAZ7TKy qSTx+/JLNv0+89WU8PGsigDFtPP7SmF/RjmXlpvwBm2pwDyHhd9QRX1EXVxaqHsC39Zf 0WHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=TDR1E5MZ; 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 r25si7655965qtb.242.2017.08.07.08.44.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Aug 2017 08:44:16 -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.b=TDR1E5MZ; 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]:38036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekCT-0000MA-MB for patch@linaro.org; Mon, 07 Aug 2017 11:44:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek86-0004cS-9O for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek81-0006Wh-Jm for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:42 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:36556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek81-0006W2-CT for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:37 -0400 Received: by mail-wm0-x233.google.com with SMTP id t201so10325952wmt.1 for ; Mon, 07 Aug 2017 08:39: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=3HFch1EWRGn/6uh5F40O85V1Edv9RLZwoWa6B9YN0XE=; b=TDR1E5MZfn9FHIYqK1tA6d8cz9VJEnahgO+998X3bncByHhCh0GgkVfOPf0FIn5ydj u/tX80fY1HS6c0by/JN8HvKdziKHH0sZg15Zce9H88cD+Ij/pp1oISHBIhtb7q4dvmoH w6QJ+4xXXjnBoVTHZGIoG20rNgkDu3TN4I0Ic= 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=3HFch1EWRGn/6uh5F40O85V1Edv9RLZwoWa6B9YN0XE=; b=dz+9H7fhtcNXDc0m5hnFyN3ryXZphcjctV3K6apEplS/aQpQCC8PL9nnK7LDZDpsyG swCyLyIHoQnClipQ7PXH+n2BM9vKXGePWwtKvpQrjpIRsfubow5S3RSl5gepSUxsIarM NvfeNXLnTaJ3UL8nyENXz4wikp3wl+GSY1/1XXl1U8zYQnRmkcjrvs9oKUTyU+Dqc363 BffhAhZxjfFSlC6qdGALoIC+eZD6cgizgTLdmUTRSomcMlpmN/ojlCmopEsif9YysEmG wbqIAeeaFg+DoibGXndC2EaHdR+Mbx9IhCyB9rUSgPat7ngoJ5xuC15s87AENghO26+h NX2g== X-Gm-Message-State: AHYfb5icw2vqjweqsEbeOSfIkIFE90AdW5+cc5uf/xIjMKiSGATH5TeS lm8CNd8kTPb4dM9q X-Received: by 10.28.102.132 with SMTP id a126mr927142wmc.5.1502120376042; Mon, 07 Aug 2017 08:39:36 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 93sm12336281wra.82.2017.08.07.08.39.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7DB7E3E0268; Mon, 7 Aug 2017 16:39:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:29 +0100 Message-Id: <20170807153934.29477-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-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:c09::233 Subject: [Qemu-devel] [PATCH for 2.10 v3 1/6] docker: ensure NOUSER for travis 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?= , famz@redhat.com, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While adding the current user is a useful default behaviour for creating new images it is not appropriate for Travis which already has a default user. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 1 + 1 file changed, 1 insertion(+) -- 2.13.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index aaab1a4208..d7dafdbd27 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -71,6 +71,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian8-mxe docker-image-debian-win64-cross: docker-image-debian8-mxe +docker-image-travis: NOUSER=1 # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES), \ From patchwork Mon Aug 7 15:39:30 2017 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: 109567 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2904856obb; Mon, 7 Aug 2017 08:43:19 -0700 (PDT) X-Received: by 10.55.41.153 with SMTP id p25mr1286975qkp.211.1502120599685; Mon, 07 Aug 2017 08:43:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502120599; cv=none; d=google.com; s=arc-20160816; b=sSwJ/uZvGsjcl1iWh3Q+GcSlmdjJrTGTP3RpAeQuIIwY7xCggpkTDq74FdD1L+O3uh xae4nBWBf9h9FVEz53rAOhlfgeStnhF2G85j13xPhhiBz2Q3u5McFyWrEiz5GLAMt7OP YtIgsn4ftItQZWx+8rdV+duUa/JfalYyiU5WshS3CLoGlGrQMPyQwUptXbC+lxWMUuLi zr/tGjXBnd9zAgaBRZ7XhMY+23lXlIxrywmSZ5Dn7ku6AWtIkGDy7VjOkSApIiJnnHS8 J7706FqtCWUfpDmmGz3umj5gIin/61sxHyfCLl7r1Y7zAXNSzeZ18xF33YC9aDdB9vhJ Xi0A== 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=BAdTOTXja9oZlrq5Oa016+DvPowCX3BY9IXz2teUulM=; b=O3i4ETb8Y8fFdc/3EdRyoyEZMXBsBJRG3sk0+iw7GESSlB5zzFuLltqINr7MEf1R3q ZQHOJ2Y9S0HXaRbJgR4yGFNXTxRistqvN4Q1NpHsU7ROXIrG80KStxUjZKFMWLOXndNa 1yUrlZpv0MVovyjMT+6KbO4XyMDdwvuPBQi2HaAGUoZjIh/ib/MpOxy1uul9PdfSybWY UWQwYCZbJwfG6aD7JA2X0e/kR0U2zJnfw7C8o/1g+0ck/JcjeBeU6Xqo7wIhixhOHchT RF/+tYoRnEeobMSPvxzzTDULOnyWClyyrShImuahPmODXPbIpk2l7uZv/kiVjJOO6xyZ egyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=CIaXbsgY; 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 n33si7848416qtn.149.2017.08.07.08.43.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Aug 2017 08:43:19 -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.b=CIaXbsgY; 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]:38032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekBZ-0007yL-44 for patch@linaro.org; Mon, 07 Aug 2017 11:43:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek88-0004eI-J8 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek83-0006YS-Ol for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:44 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:38092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek83-0006Xs-IX for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:39 -0400 Received: by mail-wm0-x230.google.com with SMTP id m85so10136285wma.1 for ; Mon, 07 Aug 2017 08:39:39 -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=BAdTOTXja9oZlrq5Oa016+DvPowCX3BY9IXz2teUulM=; b=CIaXbsgYj3ULCWQzvdIbFiq/fl8A2QOz1saah0O6kUbkW4Z6DpPI7fBnl7PCCFCh5Y CcU/njRXJSyxljfUIHGv2VLIClZusgbXuP7wXj7052ZWuTMQDBeKasRqRF1reZf0UIvV sbrKkxIhwGxAMrEnAgB64OfC2yAyu5P0kWkMg= 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=BAdTOTXja9oZlrq5Oa016+DvPowCX3BY9IXz2teUulM=; b=ZDa5UJujj7qc+zfrQ9dRHSnW5+7LluDq2dLCo9Q/1tnvhJZU8E/h0DI4iBdY692xbk BU+gVNMJtOHQzzcLhg1bSeZ8hGTDR8odOfX8c7WcXiPipqwJ78ymRkBa/iIpenODPBU4 mQtkLcw/V8z9rVQyQol36RipeMEHk4Q0/GbHy7nk6tIkte/Mf/P+VnmDv9/M41XLxJDx 3Kvnb99Caqo6yjVFb0phUpXOBIb+FpBQCRlGKxAlso0wyWWq8evBlNAH5jCfDctLXrFR OOmGOhTvGIPYDdH48hiCeDo5fSoA4AnVim45PsblnbhQX/HEJwtEv2xuo00kMIWilNUK PwVA== X-Gm-Message-State: AHYfb5g1/StikuZ0WwGgeq1rE6eR47EAxa1c/EH/sSV6rFZpj+fGPzdB Jv9ekSGeAjqJisRt X-Received: by 10.28.226.136 with SMTP id z130mr903928wmg.153.1502120378440; Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l1sm10893876wmb.18.2017.08.07.08.39.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8E67D3E02F1; Mon, 7 Aug 2017 16:39:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:30 +0100 Message-Id: <20170807153934.29477-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-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:c09::230 Subject: [Qemu-devel] [PATCH for 2.10 v3 2/6] docker: fix dirty/stash detection on some systems 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?= , famz@redhat.com, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I reported this a while ago but evidently forgot to push the patch upstream. Without this I wasn't seeing the dirty tree state submitted to the docker build which is very confusing. Reference: Subject: [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call Date: Fri, 28 Oct 2016 17:33:34 +0100 Message-Id: <20161028163339.31096-2-alex.bennee@linaro.org> Signed-off-by: Alex Bennée Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d7dafdbd27..ff580edfad 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -20,7 +20,7 @@ IMAGES ?= % # Make archive from git repo $1 to tar.gz $2 make-archive-maybe = $(if $(wildcard $1/*), \ $(call quiet-command, \ - (cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \ + (cd $1; if git diff-index --quiet HEAD -- 2>/dev/null; then \ git archive -1 HEAD --format=tar.gz; \ else \ git archive -1 $$(git stash create) --format=tar.gz; \ From patchwork Mon Aug 7 15:39:31 2017 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: 109570 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2908481obb; Mon, 7 Aug 2017 08:46:49 -0700 (PDT) X-Received: by 10.200.36.54 with SMTP id c51mr1494621qtc.25.1502120809594; Mon, 07 Aug 2017 08:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502120809; cv=none; d=google.com; s=arc-20160816; b=WYVg2Lqh/HzgDiepHdXWEdapUMvh/8bSDhpWKLgYj7urGU0G8hqaFk5TSDnOJQLY3f i/qAV8KE27oJRPgvmwW7GS7NlNi1U0IVAayOMBGVu4vbXJD8pWi7y5/N3UporL2F5zPW G4Y5MveVGJSn9inM19QcZE9ab8kBN55gtu5HqvLYdtMHgT7PPfLbmOXILIzidqULqFE2 lCmm3T8K+vR0KelCyNe0SJFqh6kTOgVKpLRt2sFIPheAgIyAEO9HoLgv9oMYd5B6fiFD Y3dMxGS19TRYXFXqaabKjm0nrJ86BnYdbwZOYs+qGlsE95a4RT6p03f4znTah5ANJDW0 n52Q== 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=0HMQNZm3VL870uU3kGRywoL/gavdjO/TYOrKDp2c+WQ=; b=c7B6WqVaii9Lv0o5r7gTL7Kdvu2VCiT6nSUyWieNEHQJ1qMU0P9eA/eUHT/A/LdpFl h2+H/s7az6W4q2PkgvsgLF9lbexdnDgz5KO6RIPcjtFLyx85e1R6xUHju5JVyZf0by/K SBgVc5mqcEwiybZ/DOebTagdlLUVnzIb2yVcivhOa9i+KbTvJlsRzrUx1Y1uKCszUGAC QyMgOrYKX1PLS/N7I01jigGHvaWLoo1/eWBvJQRoD4HCPjmFrf4KGF+JVqKNQWg/8dq5 BghlYwjRTgaMeJA/v+ChGZGRFoMBmqx1S2idIgFgkaABiuyp1136Ka+IfDjmKP2EnUYE Y9gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=WssuH5NU; 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 c76si8430255qkh.349.2017.08.07.08.46.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Aug 2017 08:46:49 -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.b=WssuH5NU; 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]:38054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekEw-0003MF-Uu for patch@linaro.org; Mon, 07 Aug 2017 11:46:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8A-0004fB-0u for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek85-0006ZV-8J for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:46 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:33376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek85-0006Ys-2B for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:41 -0400 Received: by mail-wr0-x231.google.com with SMTP id v105so3325195wrb.0 for ; Mon, 07 Aug 2017 08:39:40 -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=0HMQNZm3VL870uU3kGRywoL/gavdjO/TYOrKDp2c+WQ=; b=WssuH5NUhfxobN/1rAMQShyYCtN6Y3aZcmMbrdxOMCTp1m3fggn9O1mHOI4NTuVW6e G1cteREbVRAerCzdFBiN8+9sD7fHNIazyE5oP7n+wwdLduWYNnKNcHH1/20yIfBNESE/ E7lFaMIDuRD9kVju/k8LxHnLR2yfGyMFjtDYc= 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=0HMQNZm3VL870uU3kGRywoL/gavdjO/TYOrKDp2c+WQ=; b=QDnqiQuY6yQSH9ew6voTTmXLZo/0+yajOIM2OdSaQ/A3woC2zjYQlW6xx/LvN3iD0b 8CBvPa0IT6VbCTH2GAphqtLgpmPfzV+TJMEoIS+TpTRqKGCNc6q9ruyrlK0bQ5vTYhRm pOkbIPeeWorkxyLK8/XEbaRPvhpPxXp3Kv8Qh1qNJgohGjvwI4mLj/aXbjdtfNZZBrAW RBX6ZY/e3+PcHTFXu4zHVNRLN0tD2e2YWSIZZ+l4NISCY00yx97bYVQFiZtTHmN92dGt 4eaVCnpAeJ/eyDqsbkp7FeISWGEfMnPqYCAGt+FLcJP5kPpENX0yLylqVJ7qUsajHejI tfGg== X-Gm-Message-State: AHYfb5ggIUMD2KBS6wFyjmsMLepz4hSq+7eBnzhdMvGFfVrW//K2tgb0 wunScYbSlDp2h3kg X-Received: by 10.223.136.78 with SMTP id e14mr698788wre.84.1502120379965; Mon, 07 Aug 2017 08:39:39 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c34sm18996963wra.80.2017.08.07.08.39.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 9F7143E04E4; Mon, 7 Aug 2017 16:39:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:31 +0100 Message-Id: <20170807153934.29477-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-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::231 Subject: [Qemu-devel] [PATCH for 2.10 v3 3/6] docker: ignore submodules when checking diff 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?= , famz@redhat.com, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The QEMU tree often has dirty submodules in it but this will confuse things as git stash is not going to save their state directly. They are likely just dirty from build files anyway. Ignore them in the diff-index command. Signed-off-by: Alex Bennée Reviewed-by: Eric Blake --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ff580edfad..2a560a5327 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -20,7 +20,7 @@ IMAGES ?= % # Make archive from git repo $1 to tar.gz $2 make-archive-maybe = $(if $(wildcard $1/*), \ $(call quiet-command, \ - (cd $1; if git diff-index --quiet HEAD -- 2>/dev/null; then \ + (cd $1; if git diff-index --quiet --ignore-submodules HEAD -- 2>/dev/null; then \ git archive -1 HEAD --format=tar.gz; \ else \ git archive -1 $$(git stash create) --format=tar.gz; \ From patchwork Mon Aug 7 15:39:32 2017 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: 109566 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2904788obb; Mon, 7 Aug 2017 08:43:15 -0700 (PDT) X-Received: by 10.237.39.3 with SMTP id n3mr1421795qtd.149.1502120595824; Mon, 07 Aug 2017 08:43:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502120595; cv=none; d=google.com; s=arc-20160816; b=vkSvG4ys7hsK/jJFQjoggBbMj6zotTeYSWTBIdwoUrf1x3is0MIMqtjkNwK3h8GoKn SuO2GumN7UPRv7nT7Lw9vWNmJsq/zngZd1aVIyn4BvzvQQidDMBVjsJ1/09DXjVJ4e91 gK227iN9EEefug1PTDH6rVZNZRVpQaTkd//xZgeTYWoNhoctVSNN4+Ea1/cvk4s8StX/ pM8jcz8KhLyj7Cx88wbFcAXeftQm+eT4k3jBTObno6gcgbvIgdDsScQDB9PeRisZDI8G FAJ3jwDKV3P1ueZLnhLZ9sGDZJrkvI1izOZL/Lep22SsY+sPEYE1hS6gX9uJ0/XOWeRX jN3A== 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=zX55oopMfKp58Mp0S2zLwXspD9H7wd7hITYCTAOR7mQ=; b=ZH+oN3B5XBG6+32UQear7vxuAHg4BWftsBFodGvUTs6c0rqGYaLVXodFRsKT6POS97 Dpl/P2U+GBHOklnFEPkIk3jp8M8G5Ry8ubQeYINOtAgty9zMy8RtIbxafD1h1QmTK7lY N6SBadB7S9a0y6qsNT4yH8Lurijc3hBjotA1NzzJeLE3EIKqlrEC1SezlLrZ9spMubwv gIIorUJH5YA1hcDnUhYNjwEaG8oqf4kBaA6fKafdZL9lIQ9bq6Jx+5Xx/OO+YvlPpC3K IK3vgeckZOYf9m3N84pVPndpuZA+PppXz54o0HDkRRrEOM4H/OnkoKQYTQbXnDvPtHT4 bs8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=elYUu0FX; 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 r189si7241214qkb.68.2017.08.07.08.43.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Aug 2017 08:43:15 -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.b=elYUu0FX; 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]:38031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekBV-0007us-6k for patch@linaro.org; Mon, 07 Aug 2017 11:43:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8B-0004fz-27 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek86-0006ad-A7 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:47 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:35784) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek86-0006Zv-4T for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:42 -0400 Received: by mail-wr0-x22c.google.com with SMTP id k71so3229988wrc.2 for ; Mon, 07 Aug 2017 08:39:41 -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=zX55oopMfKp58Mp0S2zLwXspD9H7wd7hITYCTAOR7mQ=; b=elYUu0FXuwTtXUohUFTY4NkgIEKejF1WsW/H3HUHQ1k585YkqloQY1Bfvg9EO0NaJ5 LtDZZfjcxgXIWI0H9Xg6XoeWxSUzWAvSd9rnxgYdCEHGTQC74SCmfsdW0zPk48Z0xdXS qfyf77NoLDVbwj5UGQvjSNBKO7sXzl+7zRc/k= 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=zX55oopMfKp58Mp0S2zLwXspD9H7wd7hITYCTAOR7mQ=; b=SGFz+6KW1jvLm+Phwd28aQbdI073cVYdvkEjOPHrAnxTH4A49NdYlAIm1DR31JWuDB LigaMFcB/vUqyPtEvVqoKAyMhzkiwjLLRuzT/SpaEOlLamE/3aA9TdN11MrtveUdkYZo forTcv5R2OLiGQHAFhH6BP0XUMxauF6TDgjwwuYRKtWVzeiOC7zzPiOVrs0/5jngFoI0 Ri4VcjcV/7vpTzRq3kTK6V2ysswY8Pipwd6VlTtX+Tk+a2+9lRX+V7rmRqSdfp0nAT13 5mskiiyamXjm+rnaMvp5iuQrZ1nfVsPymCQAnPuVMbPOpz8SPG5eOSw0gVH7pmMpNr8x ykzA== X-Gm-Message-State: AHYfb5g95JMUk8wuPGB08FET4aPGe7XdINN4eKdcLaDAgcCz+AAC6nF5 09EBBl2E9Mw7Auh0KHXP7g== X-Received: by 10.223.170.217 with SMTP id i25mr684175wrc.140.1502120381039; Mon, 07 Aug 2017 08:39:41 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i5sm10828971wmd.47.2017.08.07.08.39.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id AFA083E04EF; Mon, 7 Aug 2017 16:39:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:32 +0100 Message-Id: <20170807153934.29477-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-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::22c Subject: [Qemu-devel] [PATCH for 2.10 v3 4/6] docker: docker.py make --no-cache skip checksum test 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?= , famz@redhat.com, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If you invoke with NOCACHE=1 we pass --no-cache in the argv to docker.py but may still not force a rebuild if the dockerfile checksum hasn't changed. By testing for its presence we can force builds without having to manually remove the docker image. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.13.0 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index ee40ca04d9..aab1648cc5 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -261,7 +261,8 @@ class BuildCommand(SubCommand): tag = args.tag dkr = Docker() - if dkr.image_matches_dockerfile(tag, dockerfile): + if "--no-cache" not in argv and \ + dkr.image_matches_dockerfile(tag, dockerfile): if not args.quiet: print "Image is up to date." else: From patchwork Mon Aug 7 15:39:33 2017 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: 109571 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2909026obb; Mon, 7 Aug 2017 08:47:23 -0700 (PDT) X-Received: by 10.233.237.212 with SMTP id c203mr1351102qkg.328.1502120843628; Mon, 07 Aug 2017 08:47:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502120843; cv=none; d=google.com; s=arc-20160816; b=K216MaJqRy6M6ntSMk+/amXY0stEPFRNWfjXN2e8cBj0Uceso1iZcx7tvaxy9WU1+x 4mz19H8t2qBNq6+1H9BlBBioPIEMwpwIjL7eS2XgX4B1eG09tYdSTAbVfX/pfinQqeV7 N3yMY4X4sUlrn+HVLpSffCTSiBw32nu0mphSI4lfZz4hsSmAwchoZxa8nxeY1BV3fT9r PpVt995U4VGfJR9rcTqqHj9ZjTNLsctdwu25PIL/dpshW8TXgECHArL0FbFpugooAm6V z7TZgewZSYCKxVM0Af3R9fUtCaVP1XSgO4NsYjSv88ZGYf3EPNLIs9Uo4cjcgdl7IWvt kRCA== 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=XIFJ409ohgeTvpR0LvqzWWDCJlIAxlaymrKZVoXpo28=; b=pb0r94qk8ry3mPQpVNT47p/8HOYNJJowYZTzBbcDLJ/EqUeWUP/uSWcaE3aumATpjp QorPHMifCGaswmsA9Ri5Imsl6M/uKwLw2HLyWL4SR6mBshikQPBa1rq41Tf48TOcmA+X Mr3zdhoWnvb+n5c4oXj/CYCF+ao8jsZEqPkInTnYtd4jrQmx5tejVu1iTFD7O4jctWwG XSNMTJSTb9sdc1BkHS+kDpK3e3hr8HKSsEw+OMZEk/yAr6KKPqpu40h1Pzv+2gvac90N u0rIwc2cI/vmvWfKg0R2OWVi/sR20Y9OR61cJix6GoeQmCf3p87gRo5Ivc7AnlLLoITo nwQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=ivV/9Msv; 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 w89si7651771qte.169.2017.08.07.08.47.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Aug 2017 08:47:23 -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.b=ivV/9Msv; 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]:38058 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekFV-0003fw-3p for patch@linaro.org; Mon, 07 Aug 2017 11:47:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8C-0004hC-Ch for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek87-0006bh-Ch for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:48 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:35787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek87-0006ax-6N for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:43 -0400 Received: by mail-wr0-x22c.google.com with SMTP id k71so3230180wrc.2 for ; Mon, 07 Aug 2017 08:39:43 -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=XIFJ409ohgeTvpR0LvqzWWDCJlIAxlaymrKZVoXpo28=; b=ivV/9MsvMgi1iP4H/1by++4gEEN/jR+qQ23lkipjpJBY05WfGW11Vxltw2/qaUPCmt 7hmr+tMr3WkONz5YL1Vq/UcHuBPCmbFEmxJu9gX9ASfWDOU/l8IuTCPFp00TWMVr144t Upai1yJjpdlHrh7jH1zWOgD7BdIaecR7+RlfQ= 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=XIFJ409ohgeTvpR0LvqzWWDCJlIAxlaymrKZVoXpo28=; b=G56qCzFBNmFfIcZZNhPoOTIhK1qGwcZ3AK79IPiircgQvcqUyCRHUjBblvUtpvbDPi xvD1EgbRZDWuDGrxXxBb1WuURH6z2lXV5ou+0nmXazZZ4Knj68bf4BcQbJSUo8K12tmf MvB6Dh0ObkQS7qB09C4ZcGO0kfRDAnUJiMqG51m+zMHdIz6NBDkGVEErrkooA1DRCak+ YygUltcPsSj/+Qv2Kl+6pyj1mFp0i3l6CenvcQCQZUPP54tv9/m30hNhhuUAd0QayH10 HJkHooi3t9u9nFg2L7sVLvUJhJDBYf7ASfQxqvZo1jLyvYsmhb7TX/2t8o4+SUfaf/jy QQcg== X-Gm-Message-State: AHYfb5iUeeKyuLeeOiuEN6CwvrnOqam3MUqivhipUfRSGVkzLKFiGuow Ygi5rJxNyg5kHC0oOD1BLA== X-Received: by 10.223.170.2 with SMTP id p2mr839930wrd.22.1502120382192; Mon, 07 Aug 2017 08:39:42 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u49sm9762819wrc.14.2017.08.07.08.39.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C091D3E04F1; Mon, 7 Aug 2017 16:39:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:33 +0100 Message-Id: <20170807153934.29477-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-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::22c Subject: [Qemu-devel] [PATCH for 2.10 v3 5/6] docker: don't install device-tree-compiler build-deps in travis.docker 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?= , famz@redhat.com, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Installing the device-tree-compiler build-deps is a little extreme. We only actually need the binary so include it with the other packages. Suggested-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/travis.docker | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.13.0 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index 636fa590a5..57ac8e1419 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -1,6 +1,5 @@ FROM quay.io/travisci/travis-ruby RUN apt-get update RUN apt-get -y build-dep qemu -RUN apt-get -y build-dep device-tree-compiler -RUN apt-get -y install python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools +RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools ENV FEATURES pyyaml From patchwork Mon Aug 7 15:39:34 2017 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: 109565 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2901921obb; Mon, 7 Aug 2017 08:40:21 -0700 (PDT) X-Received: by 10.55.100.67 with SMTP id y64mr1340158qkb.246.1502120421864; Mon, 07 Aug 2017 08:40:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502120421; cv=none; d=google.com; s=arc-20160816; b=mEbGewd2q5chWk6pxRV5fc/rlOvIkGQaOGNhL82RBGfhYs0k1YV7u4EsaOyBPyQ3e2 JzIeBy5BuJC6d6xHSZMvQqRKhTRd+3bi+6izCkNi8k3KEHT8BGXiL7sxS3QLFHWMjfIS MW8u8WWpB0wL/g9NCtkzHiDni2mDvdojoPZHqgtzqv/UD22tBHMu9TkCLpDUJGOPkvHw FGbQnfsMvn2H9SUqQFxggW2SJv60yK80YWBsl5sI7tJzG74rd9+TQKZKaGST4k1rLzcv qvghmOXYrT5ONqnxEtzt4XlSEn2xhDHgJRCykLTKDRZA/0A8sgJzGYlKOJlcRNtI4h3D 2yWQ== 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=yx2s9ujM23DVxb0ougXAWXQvT+zAb7b3PciVRAqkrW0=; b=TW/Xw+2P+3BRkPu5QkeUAFjG1Bqi/6i0sPQTLIj+y0k0sdzz5K8AFr17Kof2X8gvPT dmRoWkY32veMplZSHLLh2SuxtI7+aKv3lNcFJDAlCp0ByOO+bwKXfcumRbM5N3v3G9eN alMg5loETmLMp74ZZyuKeITHmndTkrNVLJiFzJ14tz0u4isx8oS4UEtxns2zvLWEQFNz W9o+0B/8cu+Ss/5Kx/xBi0sPN6p8X9CkaBQFDjzM/BgEX7vCGf7eoL4bigIKOubmRg/u /VLLgcGXNAWMdY5KEaptQcjvFbq8diLaXY2PbxyL9bnrgOfk4Anq1m2YO7Vs2QjCkIr7 lhXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=D7gco90N; 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 o54si7823363qto.512.2017.08.07.08.40.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Aug 2017 08:40:21 -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.b=D7gco90N; 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]:38001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8h-0004pj-9X for patch@linaro.org; Mon, 07 Aug 2017 11:40:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8F-0004jz-12 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek88-0006cw-RT for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:51 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:38121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek88-0006cI-LB for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:44 -0400 Received: by mail-wm0-x22c.google.com with SMTP id m85so10138225wma.1 for ; Mon, 07 Aug 2017 08:39:44 -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=yx2s9ujM23DVxb0ougXAWXQvT+zAb7b3PciVRAqkrW0=; b=D7gco90NeAseOLHyXtwYHvgosA001HHQd08j9Jfq04Ia8NCP4JGmi3exMVQqjfoDyo aC66dWb/DFCLnsU2NRSTE5crxP1/oKgGzJsSFiDxPFPGTv/e1KW9JJ2ewbwRvpTkcIt5 6qra5mMlySea9vPV7wHnJDNCCO2Ci/o5rt1Kw= 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=yx2s9ujM23DVxb0ougXAWXQvT+zAb7b3PciVRAqkrW0=; b=Kl3CrQyeUvDuS5HEBF4MaQgzK4+ek6+iDAvil1wqE6TOcLFcCo95LSYZDX8dos3W66 vrynpwQMKunnVo+5PTH6OzAlDyM+ZY9wdW4fxhvqL/OsvmZ1N8I+pMXnqnYj6mIFrYej yG+MbbG4Iy5WX+wWrf2p8T6S54zhGWB3jHwLPDWXYmXDHxWApUtPdQtPPbkoDzngBOY5 D/ka3eNsJwzcO2QpjiI4Ri8bx7/62+WgNHYA1uzQTFjQAoO4aKlFcAPeCOuWu9G+HfoI rLXFCu2EitSgSUz7uw7OJChh1tt0WTsEwim7ce5+y7vb080RoQ+yrfA2BZNpOqxrzj+i Mh0w== X-Gm-Message-State: AHYfb5gvNFMFppXh2FItLUjj6tmu2/zWsKtmivsL47dhAXaJd2ljcO07 L/vGwTS7IJU2vY0U X-Received: by 10.28.238.85 with SMTP id m82mr923990wmh.107.1502120383503; Mon, 07 Aug 2017 08:39:43 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u66sm13693789wrb.77.2017.08.07.08.39.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D0E4A3E0550; Mon, 7 Aug 2017 16:39:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:34 +0100 Message-Id: <20170807153934.29477-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-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:c09::22c Subject: [Qemu-devel] [PATCH for 2.10 v3 6/6] docker: reduce noise when building travis.docker 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?= , famz@redhat.com, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Set the DEBIAN_FRONTEND and locale env vars to stop apt complaining so much as we build the image. See the Travis build logs where it is done by their scripts. Suggested-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v3 - one line env, drop LANG - add r-b and t-b tags --- tests/docker/dockerfiles/travis.docker | 1 + 1 file changed, 1 insertion(+) -- 2.13.0 diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index 57ac8e1419..03b7ef34de 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -1,4 +1,5 @@ FROM quay.io/travisci/travis-ruby +ENV DEBIAN_FRONTEND=noninteractive LC_ALL=en_US.UTF-8 RUN apt-get update RUN apt-get -y build-dep qemu RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools