From patchwork Thu Jul 20 13:47:14 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: 108346 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp2153116obm; Thu, 20 Jul 2017 06:50:11 -0700 (PDT) X-Received: by 10.200.37.215 with SMTP id f23mr4777348qtf.138.1500558611225; Thu, 20 Jul 2017 06:50:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500558611; cv=none; d=google.com; s=arc-20160816; b=ecMyzBP42HjfrM1QHr8+0HC4EOtr2zepymRvoSFzrie9rbICdAo5ykAZUcipdKFK34 HAyuVtWkT/jR8oAK9M7cjQtORWpwiGr1GsLtW7NyJwVI8v59NHb1j3RLir1x3Ivq2TZz cua2NAhBK6q4/d/LEOdUYLv3R7eA996z6hRAjinUkG5lqx9kxiWtsapmy2aQAKkWCzYc q6ouFYSXhLZgyASaJV5m9wfd2jZKTGdLgvgr8yad+3U7uo/yOO/6Fy218zLhschMrt1J BqOP2LTMFVeFINbs2Zxd8YNkf6kasJNxJeA62AeNXE5pdilTTjc56S5NEROTPKnhcNpG x4Hg== 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=+1OafM8v7rjnd34dTL+ylIYu+py7zgmz9as0F7s7rRU=; b=hS2K3Hblqk7GrWTVizsNSd1VzgCSvwRLM6nQMTyOFgdg/Q9V2+uCY37QA6Nolq7aBn JbgUArwdnAHTJymrxf9OrnJpH7phZUERM+Q/sOiTIsLHDj2Shw5QvD1cCR/71UGO2IEm g83OKDqZzz6Exe7spFC6BoSQI+TOOqHpPWggiSB1GwZ5qhgiAeoVp81opg+EuGxxRcpp m/6wrr1MtUrZVWtNT4XVDcDmSX79/GLMHVk6ZL64DGM7xT/bzV0Tx1cnOoWcwtODWU9q Q2BfNddH2vw2XUNu1enODSoIGaLxMLjNOKnYRrnP3U6aysfDwNuNJhnJ6FsTcqob8BZM 8asQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=fH/xWf5/; 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 p2si1951474qke.406.2017.07.20.06.50.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 20 Jul 2017 06:50:11 -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=fH/xWf5/; 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]:38189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYBqC-0005vu-LO for patch@linaro.org; Thu, 20 Jul 2017 09:50:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYBnY-0003sw-Td for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYBnW-000891-9C for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:24 -0400 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:38007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dYBnW-00088L-2j for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:22 -0400 Received: by mail-wr0-x22d.google.com with SMTP id f21so14586985wrf.5 for ; Thu, 20 Jul 2017 06:47:20 -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=+1OafM8v7rjnd34dTL+ylIYu+py7zgmz9as0F7s7rRU=; b=fH/xWf5/2WTi4BHh6Viiwva2lkh/X9L5WOsuV8J8XHlIPZoV+sMdflssdg60kunqOI rF2qI49kPluFnYRHevxmUoAdo2Dr7J1IEchZuWFt16BzGLCM5Uqb/hIhsg/wXtSkDwlK Np1Zcs2bnm8w82inoZ1o4g+sBnlUmZGLldqf8= 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=+1OafM8v7rjnd34dTL+ylIYu+py7zgmz9as0F7s7rRU=; b=bzyV7/q9L0QhG5CIYnkECKZVQNEIS3e+xD6pfV4xJsGP38+xgUzHu5t6mORbBkm7IY guElGyCf/EYB4cCaFgUl/VGBQhDTGg3WMq2QAP2DpAOS1t6oFxukbDNP9j1Ry+bPflNp I+K1iqcKiIPeYUwlnidcrHE6KrC0CmmFXmz9vSi+dsYeuHjCcPmy79jzrj9JtAzg7srH Sbqdn2OyeWbl3cFjKQ/nhQLiMliVTnzEmXvfoqF/EHAmvEAprXl5YrPEnGM5rMlNEsbh XpobIbFEUSKiux7yqu8wdiLVhgxKDVxRYCdMjMrC24C1lmO+tpBgI7Rjml47SOacX2ta VAWg== X-Gm-Message-State: AIVw1113zuEXMCerwUKzEYiWjgJiEQ9vlFQAme5moePROdDBDzSttzS8 NK8YaK5HaxgbJ14i X-Received: by 10.223.164.154 with SMTP id g26mr3017630wrb.230.1500558439372; Thu, 20 Jul 2017 06:47:19 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k40sm3570040wrc.34.2017.07.20.06.47.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 06:47:17 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F11973E04E9; Thu, 20 Jul 2017 14:47:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 20 Jul 2017 14:47:14 +0100 Message-Id: <20170720134716.13049-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170720134716.13049-1-alex.bennee@linaro.org> References: <20170720134716.13049-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::22d Subject: [Qemu-devel] [RFC PATCH for 2.10 1/3] 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 --- tests/docker/Makefile.include | 1 + 1 file changed, 1 insertion(+) -- 2.13.0 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 Thu Jul 20 13:47:15 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: 108343 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp2150634obm; Thu, 20 Jul 2017 06:47:47 -0700 (PDT) X-Received: by 10.55.161.68 with SMTP id k65mr5048452qke.57.1500558467658; Thu, 20 Jul 2017 06:47:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500558467; cv=none; d=google.com; s=arc-20160816; b=ybU3WuYPZzjwIEeqN/x5dkBQ2U8MRuITpe4TCaqfcGQGAVy1aQdxyrGURz6ULV8pbK Yu9LmPsmxsKJBPpMv7BED2AjlOX7B39X9HxX8R/95yvGS1cUpdFReSXfWcmJNv82fAj/ jOEdR/kZS23AR+N1A2YTy6717HVb+9jWoCOIfX5Lzk/v/k9g8YTGwcVkQy6HmgnrW3S0 42ay2ice6SL62GajgqyPR/0l5ewRvAOoa/+co53U1KelEseh+YZNXEm/53ny9zT3FQCJ npJu1lKt/GwzUmeofF8p/7FHCj6bq+HnVMKz1y/h9mGZPtERz7dcxfLyB7NFVLo2j8Mu W0fA== 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=LxXBJ4EUlB5PYLiG5mV46/CbrpcOoHRkfUQiYp9fp/c=; b=FpnyKxvqpIzBz4pqCuEoHwlKYzzz0O7U4Z/zrJCZ2TCaruK0hON9W1WOnadlOIGzrT ulBEib7MdL+5aa0YSVPrlWWe/azHWZdYduxvEv27yb/xQE0g6RvtdkX7uwe+eawQ2YYF 2zpH/9CEbGtaGr2SHGMDFj4PC9uZVPmi2MXvjgauc37eCvUwxR82nhXLcyLPSoRAzQ/r GXvZuFf/nzDrC12aE+ZZx+xkh89oNlGJ/zKsB8LZsfk8jrAh4cqFkqLsgjhJ5/F7nzA5 Xp9D5YVJfJCNoGk8OubhaM3NQP+VxlBqBy5geK5hMm7J1rQwh+XVFRHXIDKlXYhNgzFY d5PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=JGyWTj+k; 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 n63si1954322qkc.307.2017.07.20.06.47.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 20 Jul 2017 06:47:47 -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=JGyWTj+k; 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]:38184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYBnt-0003tJ-4d for patch@linaro.org; Thu, 20 Jul 2017 09:47:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYBnY-0003sz-Tw for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYBnX-00089K-Bs for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:24 -0400 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]:38011) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dYBnX-00088Z-5P for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:23 -0400 Received: by mail-wr0-x235.google.com with SMTP id f21so14587201wrf.5 for ; Thu, 20 Jul 2017 06:47:21 -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=LxXBJ4EUlB5PYLiG5mV46/CbrpcOoHRkfUQiYp9fp/c=; b=JGyWTj+kyMaVGMP+NcIjPFztLgFPrv2LnI9CnCXenGG8f7FIqUPQNg2Eyf2N1p6nDi dQiQAOvg4Pc2QxA1NWZ6aWovOnuYxR8PiuPaGrcIpCVpI7jHlC3Pf+KT7FO0LwjNanNW MRXxqZ6KnLT+o0yek2TsAvD037pFOV/wLI/3k= 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=LxXBJ4EUlB5PYLiG5mV46/CbrpcOoHRkfUQiYp9fp/c=; b=bWUDI/wFEV30Lx0+YjoksDkkr3e3xUr0j+surFnmEmGceTC6JTgMtr8pypGDLvlftY 5oS+ok+ySAg3InK0U/4lHeonMEIssM/IKOid52pONEascS7OyHm0aw754SMf1qKFtxno tWHTS6VCiLz2jeaoKOCWNX3BtHozl+wCodrmZ2Yuxi24e9o6VxHEVK92bArAxkg4iQSN 9hYMEcMZUxzcboqynFQEXnM0Y7Ee/FOJ24cpy0hUiAM/st5UDCu4NYOWhHN4ZcgCH5Lk 7FDDrzHNpFlbA7e79pkfGowau2553t7XpsDs0VRLDPEcs44AEmsjDRftCn4hbCkgIPmb u/wg== X-Gm-Message-State: AIVw110jyoexZgjuU55RD2RFIwckiNyg+P1vpg5KsWdhM4dIKg8HyIlW swfVGACL9Ksum6JE X-Received: by 10.223.146.195 with SMTP id 61mr5252660wrn.169.1500558440435; Thu, 20 Jul 2017 06:47:20 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q17sm2224179wmd.4.2017.07.20.06.47.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 06:47:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0DCA23E04F1; Thu, 20 Jul 2017 14:47:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 20 Jul 2017 14:47:15 +0100 Message-Id: <20170720134716.13049-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170720134716.13049-1-alex.bennee@linaro.org> References: <20170720134716.13049-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::235 Subject: [Qemu-devel] [RFC PATCH for 2.10 2/3] 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 --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.0 Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé 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 Thu Jul 20 13:47:16 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: 108345 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp2152246obm; Thu, 20 Jul 2017 06:49:22 -0700 (PDT) X-Received: by 10.200.8.186 with SMTP id v55mr4740040qth.261.1500558562373; Thu, 20 Jul 2017 06:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500558562; cv=none; d=google.com; s=arc-20160816; b=rFRFmj0orPYmKHQToZtkp5aBsjXc22od6vLOECMZ26eApznmGlLIebDeoe2iyCTdtB ns3XGb244FTj5qoJ+NcuImpZ/JT6/bNsYE4WH7i34S4upVhoJU7Yluab1ANOnZptWFtG 429LFc81l8k+TxtPKJXwY/21P23f304Dawl7JGs7yDt63VOu68tpSO1djH0xl0Aoke1c WgZVXR8CyTKnw0oqsyLBLtio2vWn2j5Bl+szLqkTZmDmEf3biyVMGKvYaMEMEnHUll4f Pp54brhPIOqULszm0qts3JX0Zvvw22Ti/eDSQpfmNTzznaFO+Mh8h+YhnmVgyVJsx4Vi 86yw== 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=KJllUUY7/JML5fthUBtJulKUKDRZoaZgVeUOqZWRic0=; b=HoyadSCfRAkzJXP53Nix2Rh5omYJWjEnhY6Paf4ssxkhAg3+Rx3Rau9P0DM1hCJ59l jOo3l0opqcpL9a9+AcLFgdnGSM/SKoU+6kEnbdbDueQ6C6hA0eM7TsUOXJKVlQip6iFm 1GSEPfjwGQoHK9vByhUbJiqRd93dQ7NPLGqB4hKZO1apEhXRePDMurs3BpacHARTDyG4 312ZuShjRMRW8iZf2z5GhSfJHhajiPMafVwhrrGXGBRqzTz2bmj1VjOzdKQIeKFKqSjk dt9cXxv/75/6H9GjwCDXMqx72aWrlXD1f0+4t5bTud6Df3b/X3KIHr1ViHv+b88nv/7g 8P2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=aZP6GDxM; 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 h36si1957249qtc.547.2017.07.20.06.49.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 20 Jul 2017 06:49:22 -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=aZP6GDxM; 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]:38188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYBpP-0004tH-Nx for patch@linaro.org; Thu, 20 Jul 2017 09:49:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYBnY-0003sy-Te for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYBnX-00089U-PT for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:24 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:38019) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dYBnX-00089B-J3 for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:23 -0400 Received: by mail-wr0-x22f.google.com with SMTP id f21so14587612wrf.5 for ; Thu, 20 Jul 2017 06:47:23 -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=KJllUUY7/JML5fthUBtJulKUKDRZoaZgVeUOqZWRic0=; b=aZP6GDxMnNW9MC+xOjOU6qojbBQaNR7dzkILncFWSAu2HjTZQOi08uAAjyANUtWxKm HhWXid96XfN0R+3aHs98ueSQBiyKHqS3czsl09pfpr2z1FkoKNe3T4wWIqlAqYN262fg UPg3I7OWgaCtdlAFhB/QlaUrnaKfz2zGP1yVY= 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=KJllUUY7/JML5fthUBtJulKUKDRZoaZgVeUOqZWRic0=; b=Bld8VBXcCHdOMZRLVME04VELNwUwFd2Vtdv0tAayFM44kND5eKFaFzsiKsSQ5vr5Nh 4bZE/IIwNYVQIoUziuo5UKaL7vPe4EneCFKamHnMpJ+DYQxIxWJniT5nJrNPBpAGe9gt OIXQpuAypcczxKSyOGCdDAiO0kPYPkOFc6csvuq4Abp+vgSsv8KFu+ztks/5kfsvgRX3 y61BheLE186JlweIhZhDOAMa5KKWP+0AX7BLKCexGS3eY1WN7zaeZ0VG8sjebhUEQjrx bqZdUvQQkz6GfsvoZSdi2zstWRKDEoeJ1KdnPMHHMnEKzI0ik2JmqyFBjvim7GiZ8yh+ 4Hbw== X-Gm-Message-State: AIVw113qjSc680qez1oacZGkDlk+u/DIDAFrtFHR6jO00BUo8cqPqQ2H 6XJC7KFFIhr6UOpb X-Received: by 10.223.163.85 with SMTP id d21mr6811074wrb.33.1500558442439; Thu, 20 Jul 2017 06:47:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y35sm7042900wrc.51.2017.07.20.06.47.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 06:47:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1E77E3E0AE9; Thu, 20 Jul 2017 14:47:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 20 Jul 2017 14:47:16 +0100 Message-Id: <20170720134716.13049-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170720134716.13049-1-alex.bennee@linaro.org> References: <20170720134716.13049-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::22f Subject: [Qemu-devel] [RFC PATCH for 2.10 3/3] 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 --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.0 Reviewed-by: Eric Blake 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; \