From patchwork Tue Jul 25 13:34:20 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: 108642 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp581814qge; Tue, 25 Jul 2017 06:38:49 -0700 (PDT) X-Received: by 10.55.99.86 with SMTP id x83mr25360400qkb.334.1500989929764; Tue, 25 Jul 2017 06:38:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500989929; cv=none; d=google.com; s=arc-20160816; b=Ny0i4lIs3jQNIVDCmQ5difkX7umGIe3YKF/Fpy1lgLeGi4p3myTtB+bZ9J0OHh32eb mf4QF6c1GabyYFVHGvNGNe4cGPMOQcx6/j0AW4ynzQKqidGIWsGJZRJiVcByNBe23MqP I0d1FTHpJfRX078uV+8Xt0Bv5vJ9G1WaUmA8064fSXdrnQoeEZgXhlXzY0seZy+LZ3vD 16uUfqTvr62cxUSn13jT8vzgMkNOnf05ojz+8uDHCkMwmXZFetSUa0XIkg4G3bLLzRV+ wFQ9IxhAppSwF/+FR9anYCjG9yT3Fj2Jlkwqj9CFG/ZsdeNz5YVHEy51JGvzwj9auKx2 ACIw== 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=VDksOfOYZ3W7kN+NAYbjcLXD8P3MrvJIZpBlleFWk5ARx40tyg6A7xI2+eLogu1h/7 QkYxu0/ZskiXmu7Nr30kIG6A0c1C6sRFrDcjLG7D5AAYnSO6LzQsfquUEpr/N7uFNVfB kCfMlir+vo7FFiQ787pLJS0sedwKYlNDKa+y325eWX1qBLvxgxYt9+sWK9qQYPGcsEnV Yl1JtDsswKuR3r6sDUBQEtxu1FFLCsoOYxrNTt3b3umDacKYTZHcmE6I0WMSwQOM7oK5 VsLTcg9JVucO3BEb/a5YO86kNKxiJZq0IesI/8i7vIVMQCikgljxq3WultyeAIrM8DV6 F2og== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=IycC8/v+; 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 j62si2539120qkd.539.2017.07.25.06.38.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Jul 2017 06:38: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=IycC8/v+; 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]:60839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da02x-00077u-Ef for patch@linaro.org; Tue, 25 Jul 2017 09:38:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZzyq-00045d-4A for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZzyn-0004NQ-CF for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:32 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:34904) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZzyn-0004Ml-5t for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:29 -0400 Received: by mail-wm0-x22d.google.com with SMTP id c184so52330968wmd.0 for ; Tue, 25 Jul 2017 06:34:29 -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=IycC8/v+AvRkXhsLwRi8sRQOkYDSGWgDFsmECUtVVFgCdWSXhpfGAa6gTwrZYh72M/ ecSaAAH3To7+oqIGtwA0tzVPo1XcIjksaheS0k2+Ah3GKEMeuWimOVWSoBlUT8zcnP1h XorvQo0jHnaE3FAAGQK6gB0pcMVAoKzmREWeI= 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=aoiRd2otwzJWoW0quaJjFoK8Nkqw+Dv1s9KvcgR40Y3SJqrLT9UaERInr9PZwqMb23 Ng1ybgmTXMFSx3h3HIbMOfjM9jbgSwlq3vw93TTB6bSrXNnkdwkyDJQSFOrsfk1RJGcl RXDO3bGbVw3DYAhZXV70Wxb5kFUyZQIMptD2U5QXu8C0ayHMXvIBCB+1zHxxW9bs88Rk rYcvm47L/tAsaBD0xiJbaGwPYhbNZoe1x66KsYOKsQM5mVf5KyZPjqsmzdyf80FD8tGD DhXYWJhON+bgorfesca3BpS679LfP1dha1RDfeE9sMdxmknYq8WsuEDW0GOUhadGLI9R UF/Q== X-Gm-Message-State: AIVw110tZCIT9Gcbh6+697AW5yiMZQtrNa2lR9AXH7XEIGGfJauLHwJq OmkRvZTWWOQ891R3 X-Received: by 10.28.226.137 with SMTP id z131mr8165147wmg.151.1500989667876; Tue, 25 Jul 2017 06:34:27 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y30sm1953699wrc.51.2017.07.25.06.34.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 06:34:25 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 42CC93E0584; Tue, 25 Jul 2017 14:34:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 25 Jul 2017 14:34:20 +0100 Message-Id: <20170725133425.436-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170725133425.436-1-alex.bennee@linaro.org> References: <20170725133425.436-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::22d Subject: [Qemu-devel] [PATCH for 2.10 v2 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 Tue Jul 25 13:34:21 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: 108646 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp586028qge; Tue, 25 Jul 2017 06:43:02 -0700 (PDT) X-Received: by 10.237.35.156 with SMTP id j28mr25541778qtc.284.1500990182759; Tue, 25 Jul 2017 06:43:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500990182; cv=none; d=google.com; s=arc-20160816; b=AuGmZLa4k/DlZmyiu8mkW893SxHQ3uiUs6QOOSqfAc4lPt7v2Os4dSNa7JCzukrUod hvXtsiNF44JQwizuMmiOlOTSefKhlc8K+JYh2O/Wf1n1HC+1j6KsTUqpbYvBngPM/E7s PFqtB7MBb5NwrrNFcEXo3Lr+h0csZReQXog75FRO+gZ8ebtliAl8+1RNL2d3qKGak3h8 dB4dLqkPZCxuqjNMhonAKIJ8AZdxESMkMQr7QSMAbBRqraMql7Hv1VZhZqWhBrkkTCPg 2CBHIb1BZGEeq/iK1beFUEK7i63kvDDxMFWCLMWp8CMJU9Msl/Q2dyDqwTz3SMvOo1Vz q+tw== 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=q9qxhNZVU9fS7n4DDs95pdpLnfRNANtjBBaME59nGQ8WgIIyRk/vOpgg6lxLCosQdt FPnOWsl5EvPQDjkS9W5ntdU9bj1iAlNTjT1lVUJUw6rAjS0wDzE1ITFNT1yu/MIudkyI Xsmv1090IHCTKVYqmrKSCqJ3ZiQKJjWA7+LbmWvem3qDNHZ4c8Xp2r0JNHIpFnK+Daq5 LqK0ZeVwcjTH+hsTgCszj1uf6cAQSYKlVZudJOEkkEAOXJC1SX1MEok6F59szierQntq hKlISgz/s+31M+qW54w8EOr2mc+JAuWFNNR8GZ4/UudmCKdtxig3jpi2Aeo1EW37TQ70 V2+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=eqqJPfkG; 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 o187si11004534qkc.109.2017.07.25.06.43.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Jul 2017 06:43:02 -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=eqqJPfkG; 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]:60872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da072-0001n6-8Z for patch@linaro.org; Tue, 25 Jul 2017 09:43:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZzyr-000471-J2 for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZzyq-0004Pm-Ok for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:33 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:38303) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZzyq-0004Ox-IM for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:32 -0400 Received: by mail-wm0-x231.google.com with SMTP id m85so42437402wma.1 for ; Tue, 25 Jul 2017 06:34:32 -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=eqqJPfkGh6t8E7uoVnwgTzZAR+XzvDua96JcrW65GKDTw2b05PMfzT8QrpL+YpIL8H IYOxpTyaW/JoLumaa0gEvIO22i6/9ykSR7uBYzglioFmno4Ef3qLQsHdtEJp+lNKYj/S DrUAf7y0a9nyDmEpNQyPGTL5VSUzZdKEBMEmE= 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=NnPfE4+R6pNShk/WBtHD090akl7CgMq4VCpyjK8JXLiML3XuJE7Zvlvr+NyeCdW6dh Ep2ga3uHRroEySQViuAmwG1HzMZWQAKjEFbrXNJalvno64oW6123atFaHt5i7dWO6dFK dJDmIySLcx6OBxYFdJVoySfecO93buouZqvZD/PT5Zz8o4T76qZyy+O6vjKN/eqlBhGV akH8ILHZW5rLqjTml/grlLE6/Jd9hXQvzgvQe9G0Cp4RkzlmX1ZaGE9TiGboebaGyiSi mTXvxNgICc+ZpVA1tRCxvz1KhFzaKdAe7QIJDKcD3v79+sFr+RnIwYQSb8MdKiP06Smk dJow== X-Gm-Message-State: AIVw113bLiB+C6dpl5T643qELv8+V6SMYkGI5csBhhtY10eNsHxxAL7O mDfxcW+LJjqr/2Am X-Received: by 10.28.131.195 with SMTP id f186mr7995621wmd.172.1500989671498; Tue, 25 Jul 2017 06:34:31 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q123sm7756949wmb.36.2017.07.25.06.34.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 06:34:27 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 54A133E059E; Tue, 25 Jul 2017 14:34:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 25 Jul 2017 14:34:21 +0100 Message-Id: <20170725133425.436-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170725133425.436-1-alex.bennee@linaro.org> References: <20170725133425.436-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::231 Subject: [Qemu-devel] [PATCH for 2.10 v2 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 Tue Jul 25 13:34:22 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: 108643 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp583128qge; Tue, 25 Jul 2017 06:40:03 -0700 (PDT) X-Received: by 10.55.180.197 with SMTP id d188mr25329223qkf.181.1500990003446; Tue, 25 Jul 2017 06:40:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500990003; cv=none; d=google.com; s=arc-20160816; b=J3rz4X2GrYV+H3zB2ro1F4/3xqZZ8IuFbbhfy78RnldjGXOT8NbBdM9Gxiz2rn+uXS viURGvK+uSx7/3wcxlGJdfCWUjVcUrO2oJEqeSiCVeIoEIaLXCgIT6eltnGSL6cbToxP vC2W5k+b35Z/llhqH+tsdfqC+3F2bO12wQYrkrzNoi2pY6pQWxvP+35ntU2HWiXNYix8 qjnEJItEezW6ej6TuNq1IdpMfx7+2fz3PgZ2ANQzzkTmUAw4dy10FtXnBI2OXK7Ybiz2 asPFq2mYmQH8v2fg48AgvjWT4IvxV8qu/DodsdMuFr1RdUXEiaYJIGetBzk9470TDQ+U Ua5Q== 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=dnaj68+9Sf8KD8j2gDCd+29lR4N1jaS7Y4XPH+mBh4XWzzyEC1DzAueXZY1lKFAbAS RXPw31AkJgzAuwLFf7wc6tsSZ2KX4Fzfr78c00IHNBkxshTRbcOY9i/5DNDtxM0JdzUj Dzlv7RtG8BT5fWACIdxzk2vQlOE2Rty3x0jb2unRgU6d5lIvVqASYbtOpBcX66vO3jTV GXmbIRVAEhgHRtruqbZt+hu4j6FFgpoo25tphSFZpluhnrX5NfuxYgjgvPwS+7QhObfq h+U2Y3GryS6iDlb1U3TK1RM8SKbN24u+q+TZ1aY0eiqAK7QunOmThdJ30sBte6kdhn33 HrXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=JjCYh7KW; 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 m65si2503296qkm.541.2017.07.25.06.40.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Jul 2017 06:40:03 -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=JjCYh7KW; 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]:60843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da049-0007w8-1k for patch@linaro.org; Tue, 25 Jul 2017 09:40:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZzys-00047R-44 for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZzyo-0004O7-C5 for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:34 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:34911) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZzyo-0004NU-4y for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:30 -0400 Received: by mail-wm0-x231.google.com with SMTP id c184so52331438wmd.0 for ; Tue, 25 Jul 2017 06:34:30 -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=JjCYh7KWpOypNJkqgGCerdt40Q9VbBP4R67pUaH0m7MFb1E5CTaY2VudNmMnyaHRX7 Mo9327WmmLYlU2ShBG+cKBZDxZtfr/iiR6E1NA+94JT5lidtK7ZkapcQn4MA9KVy0ZVK J/Nl7BTeMWnczj0nZS+nFzqZ24WUWPOf3nC90= 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=Oco1CoTeGIpWWNDAKaT42M/NlxDoBXRNN7MQaTFzGkDxR7apvAP50qzRbzSKVs4UrY MWinXjeIEHf1GkCLZDFa21KRcIwdWlqp2QvcqBANEnUYkPKHQov0PuwvMXNK7IdMIjN0 6Gex18cQDwV1XabdkfaBbbdGNwhVhUJYXcntYZJpc545hGhBwLJQJB2EWKtJq07/q6H1 2nv1+EnqkVMvKW4RNxYUsM5Zh8dx4JD/i5kAIftTNQ82y2vLLikc7/mq6o36nxShYS5o EvOvZVp/r1c5Bx/CdsqFeEktlaR3+/YAvPXZZvlz/rzLVcL9q5loW+UloYvwqXjKxK/9 KMAQ== X-Gm-Message-State: AIVw111A+IOAQeGNahbXL+MmEzcFu+aIUgC5gbobWwOJAbLfsGbbASGx oKLSb3q47QrhwBia X-Received: by 10.28.185.210 with SMTP id j201mr7545016wmf.52.1500989668957; Tue, 25 Jul 2017 06:34:28 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v16sm18283320wrc.65.2017.07.25.06.34.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 06:34:27 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 662303E05D3; Tue, 25 Jul 2017 14:34:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 25 Jul 2017 14:34:22 +0100 Message-Id: <20170725133425.436-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170725133425.436-1-alex.bennee@linaro.org> References: <20170725133425.436-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::231 Subject: [Qemu-devel] [PATCH for 2.10 v2 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 Tue Jul 25 13:34:23 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: 108644 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp584139qge; Tue, 25 Jul 2017 06:41:02 -0700 (PDT) X-Received: by 10.55.72.211 with SMTP id v202mr2164029qka.322.1500990062265; Tue, 25 Jul 2017 06:41:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500990062; cv=none; d=google.com; s=arc-20160816; b=ELa10WF4lJO1PSMqSPCyyjJs8vAT2WGIvjpxuwg1LPM6/ADFT9I/HWj0qFF3+IWO8y OiIizFO99QfzkZjmjCKRqV0ayDuoGEf7fLdiGdjZ8sW14RQNQwb5hJjVrtnsyfwcqrGf DxD+OG+IrSSUlrRhQNfXa4JMderrINAVj375CNAHid9Qc6wEGa4BnjybdWCBFpTQ0A5z YoixXcIEokU2PNm5cfD8Wa45JhKx7Do/RcuI/9V7/+OukwkLO/rvn/ZhXz5smZweXVD/ vax/fFSHxAiahoWkXU20d7dsyBT4eT8FWF/YPauunOrrIp4g0WAoHMFhWRQEECih82+/ IiIQ== 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=ryWeaoTkb73OHWNBbDaSbQPLWIoBUpkloGej8aD/egisHOn+7IDnjNv9jSneQTX18u ij7rBaeHrkUMM0dB7b8LVQCeRxgZd+KnMCpiuIwj1xslbPpLzSdIKGxZxw/P0YBT0hqq ucjsITnwhHrsNkyC6FNxXCYBBv/uJ7DIB0TuUb4rr5AqOvVoRDTpqJ5VqKPWUk16heux o7CGP0fG/HxfwyCp5i0PzgFHwrozf0p++vGUa+Pv5gptLecDq+g31+1WuMEoqcKlZpK0 QKMAb3j62Vp2JoQt9wS+OjS6Fq+WoiuwvkVgRXCxHF9gkS0YTg8w+7baar9AhfCVLzJP f8kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=MKZChZTH; 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 t26si10872851qtg.226.2017.07.25.06.41.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Jul 2017 06:41:02 -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=MKZChZTH; 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]:60855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da055-0000aD-SJ for patch@linaro.org; Tue, 25 Jul 2017 09:40:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZzyr-00046Y-6W for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZzyq-0004PU-Cl for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:33 -0400 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:38297) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZzyq-0004Ol-6E for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:32 -0400 Received: by mail-wm0-x22f.google.com with SMTP id m85so42437050wma.1 for ; Tue, 25 Jul 2017 06:34:32 -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=MKZChZTHIoUS/NQHQq5PBcnFF+ezMTo5uv0KUr1bibaZB4O4gg6yRz4Lr63lKlS1lz ix7gugb2PWp10nVwDdhTZpdvTsis83/YTWNGHWPhNYfYEQSPCSNw/XBr3BmeKYtq1CuC FREMNCjHBll2LQK4NY6RoitEsXoGBmeqpeoR8= 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=QU5rk+WyulFZoO16z06pOYnmXdX0KKUJBaqwNJ+0lxfc0jEYQhGRfbTJ2WGfm+4v/h ctv7g7m9sYNQkLUHbpq2mn0WZGEWpuucySRqdBtoKmL6JQ6LD3wRqdEuDgrKjnw8KLqz JBfi3VsifPDOIDn8Anykr7q4j983SaWK/EW3w0MS4kzNrPvuw8d2C0JNwWC1d48doL8D ZcqZbkLeYiL5V/xvOOsHD221IweZYhKJLL3Cn0PIAf9GswZ9xdp6uDc2gtxGLkrZkFln MdQWzwDWXUrg/XpgUAQvNu4m3J8tmfn4FzMwxqN11nF3j33fAMUKn4Jr5vNMOZC2zKKl 9Iqw== X-Gm-Message-State: AIVw1107EgLruqIsWsVOFPvT+doKDNYlqfFBz9uY+WBr/XmasCvGn/bK fDrElVER3ozSSRDx X-Received: by 10.28.234.220 with SMTP id g89mr8048636wmi.147.1500989670240; Tue, 25 Jul 2017 06:34:30 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b4sm15582147wrf.70.2017.07.25.06.34.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 06:34:27 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7865A3E0C03; Tue, 25 Jul 2017 14:34:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 25 Jul 2017 14:34:23 +0100 Message-Id: <20170725133425.436-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170725133425.436-1-alex.bennee@linaro.org> References: <20170725133425.436-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::22f Subject: [Qemu-devel] [PATCH for 2.10 v2 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 Tue Jul 25 13:34:24 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: 108647 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp587707qge; Tue, 25 Jul 2017 06:44:51 -0700 (PDT) X-Received: by 10.237.36.107 with SMTP id s40mr27870782qtc.137.1500990291044; Tue, 25 Jul 2017 06:44:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500990291; cv=none; d=google.com; s=arc-20160816; b=Sjtzy/lNampIdaTym7+a5AdlMjJLCKReB0ipeL32ryfi/FfP1408AG9WOw+a584nOC zboinDzWfGfn3+gsST8NDlFjL6dbAfmwS/27WAwTPm7dpRi1yIAAqjQ3yo0kayKY+8Ll qpO1XIKQdn+zQOknP8E2pJEX3O70ZQnb9OGzZjF+2vefLJzqy61szSPPPR0zpFZtW6XE agyfn1JmneBo4Py72W181YidkmSabLo0lSN6G6cbcZQsz+nAGJXDtCWavSCVKAJLBpYS x3nCt0VrRA8FZtbxT7AqMKj01lekFl4Qs4G3Kn5jwVkjsxDAp1aVWPT39RoDGNPuRN5b nAFA== 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=cN3jw7Hub0Vh11/LFUSHbsOpKVif7anErIhSU3/Js1LcLmQXs6UnhVSPKC6oj1VgqN BuikcW/rOx3SdaklNTLaRXgMIZKfDZWUyyr9MTIQuu+9Vtts1XruMyCOWJ0+lKPpo9NB r2h/5748AM7/ztwAXVZgCb2/OO01PU3WokHBZRPo9w5zdnbO8bSXDVU2K/IcXtESe+8y 6yxYYdS+0e+7ETKQWF4GZdIqF87YoPAfXFXaNvwn0y+ZibapQlS4A2NXNi3EuGcOWtOd jDnhthH3J9xpm9o0NcyWN9yuaazoCpZ46TgOVGefPB1cED8cmc55SM6M7wA/WOIoEPGB GDwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=XIoCj/9v; 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 c20si10867736qkb.189.2017.07.25.06.44.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Jul 2017 06:44:51 -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=XIoCj/9v; 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]:60882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da08m-0003DG-LS for patch@linaro.org; Tue, 25 Jul 2017 09:44:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZzyu-00049z-G7 for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZzyt-0004TC-Hj for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:36 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:35360) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZzyt-0004SW-Bu for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:35 -0400 Received: by mail-wr0-x22b.google.com with SMTP id k71so65612440wrc.2 for ; Tue, 25 Jul 2017 06:34:35 -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=XIoCj/9vo/Tp12EGGZFbiTlhXFR0zokm4wMJhlHm33gOoCzg2y+jfg3AC50nSainJv PD2AnJxWJM4iojkCMWmGdC7K1XKhrG7CEB2Xs3gyRO+hIypNm6IPK0wJkaTgQneSIZei srXo4MCFPplgCwhsUOBGtXUvdLONlEi03hR3I= 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=NZQdeZpkC4kPaOyUH3tzYNqM0s/ulvF2PMVcWI85Nin/KPSLPiPgOqQ7WOnVMVk+TJ t7yAA1QW+/OcCE6g2tk+NMPPiWect8MVtixJkmGKI+M9fWbUAo/LTdXchjJF4uMCJH+p iw2R3NUyaUHJaXaD3j40q3agyf7scAoin2dzsd1On4L1CnlZ/IsLzQKVQdbUULbF/QRQ q4W2PAoc7q3eLyXV9MdaWhrU4pmncjc8w1t3t2PGKg7Xw4QG+TDtT7jOWBLc8I1MjKs+ YBPmgsMsSpCHwTc4K3p8HfRF/QVMbMDv9XyW4qcWdxSUk3N2kPSGGI5TaxILJXkkZECC cu2Q== X-Gm-Message-State: AIVw110nPqwtzPfcOgGA4lqsPz4rNCxhWgZaxHfDRn763tq7Hk/e/bpK 2fSJxNNqO4TQaUJXjldEKg== X-Received: by 10.223.139.78 with SMTP id v14mr14832464wra.248.1500989674291; Tue, 25 Jul 2017 06:34:34 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q27sm13653209wrc.94.2017.07.25.06.34.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 06:34:27 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8A1923E0DEC; Tue, 25 Jul 2017 14:34:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 25 Jul 2017 14:34:24 +0100 Message-Id: <20170725133425.436-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170725133425.436-1-alex.bennee@linaro.org> References: <20170725133425.436-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::22b Subject: [Qemu-devel] [PATCH for 2.10 v2 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 Tue Jul 25 13:34:25 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: 108645 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp585605qge; Tue, 25 Jul 2017 06:42:34 -0700 (PDT) X-Received: by 10.200.43.91 with SMTP id 27mr5589596qtv.267.1500990154284; Tue, 25 Jul 2017 06:42:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500990154; cv=none; d=google.com; s=arc-20160816; b=f3Eo96kSk6CZloFuDh0qbAZgTzScGGWL2xiEBP/wBmuulwdj6zUkxtFg/2zeCkDrWi VlbUR8Ict3mJuUz4rcj9F3s88KCJr6hKcQTpW3G7XskmN34ufQKtk9uX0tpTgyI+HtOF 0vrDXIfanSuhk9d7VIxxyc8PRSV/rAyHC4PUZYj08j0zZFOnZxOXXj743pyIqZtimDqb NEU2W+YWx7mRPsAZ+8jab15dWx5bIUexU/Ia+sUugjNHipVgK2bKOULrOkBybi3f/VLm gtcFRObBT6u/l+LIh2omigD8AMOnFGs3qL4zjIiVsKLGwsWBSManwAlgQdKXFherhWW3 PSbQ== 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=vfpkb0JHt3myq7HZ3jHYvkfZsreqo7nG+FHzV/gUDDM=; b=p7dDjQQXgLUJHX7eHOhx+qFF55ZD0cS93bcfPPe2npZKlawVS3foj0rLZXzOXeI1Yn FQdJEPyHu1ZJsYJLhWlMh62oCv8W/5Y+52OHYwqo6Dfrqx1aZGApRytCgJdd8Yr8kOn/ P7eHPcj5qab/Ho76dvnBsqSpIeYszClvstMxywN0kMztZRMR30myiv5X9EJr8AiC47ts +6rfSB9HuH4HD0SksOynxZH/UEKNrstpn8FPUBTu13mwRphKGv28Pzgptq88o/GKqJF4 iD4R+iVhu8ArdqOAHti8oN3H7AAQRdPfBaVBHbM1k1kFuAAOJUuBQ2kZAkPnl/5QFJs1 2DuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=GqvGawGS; 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 n25si11134905qtn.540.2017.07.25.06.42.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Jul 2017 06:42:34 -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=GqvGawGS; 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]:60867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da06Z-0001Yg-Tl for patch@linaro.org; Tue, 25 Jul 2017 09:42:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZzyt-00048x-Fh for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZzys-0004SK-K9 for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:35 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:35355) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZzys-0004Qw-Es for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:34 -0400 Received: by mail-wr0-x22b.google.com with SMTP id k71so65612142wrc.2 for ; Tue, 25 Jul 2017 06:34:34 -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=vfpkb0JHt3myq7HZ3jHYvkfZsreqo7nG+FHzV/gUDDM=; b=GqvGawGSfFrEcTJDE4o5CD/acv2f6li4oIAi/Le1gOlbmHbE4+m2jasZ6pcOxGGKqL K+fzm8P71fAx5tTI+f4uaILEy/g8O5EbsJbJ2Vx2vBmmaFMVbStaJh7cKuZjMZKAqI3I qmwMU+UNFRvG8kpqZ4/PObRngbmeO9Ejw6Wwk= 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=vfpkb0JHt3myq7HZ3jHYvkfZsreqo7nG+FHzV/gUDDM=; b=P3zEceWIfYNmtfiTEq38wJfKx+rZBkp6cLJOaU+9yTrxnVBV0wrJxQtmyXIKFNx4p+ yd7Mu/bnZS8Jv4+WSgtApoF0tnacvAoBPv9kvS99dfCYdy5K5apZ/3i3R5ujx0gEdZG5 57RBkdqwznlb/AEiFwBasnRj7ok938anBritS6aPp2BzDoJlQbYiMPrPLoGLp5n/1zpT KfpO5KRR4NEUNZCC5sSqRgBsZ3lnmJMb738daar0cH7Zcg60KuXiYUEtug4UhBHw4SEP AdZNBQ/MucuA2Wm5KQNjcWhw2pO7rH6TX9bLs+Ep5nDv1UboMNHc/L1H0pNXvIjDSPVE h73Q== X-Gm-Message-State: AIVw110HnsjXTOk2pj4VnOUaElFU9MK3Sc7WMVsBsuao6idBkLYWE8oO ygFkE/72F9rXp1P8 X-Received: by 10.223.175.5 with SMTP id z5mr18319324wrc.11.1500989672907; Tue, 25 Jul 2017 06:34:32 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w71sm47022wmd.6.2017.07.25.06.34.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 06:34:27 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 9BB993E0E2F; Tue, 25 Jul 2017 14:34:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 25 Jul 2017 14:34:25 +0100 Message-Id: <20170725133425.436-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170725133425.436-1-alex.bennee@linaro.org> References: <20170725133425.436-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::22b Subject: [Qemu-devel] [PATCH for 2.10 v2 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. Suggested-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/travis.docker | 3 +++ 1 file changed, 3 insertions(+) -- 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 57ac8e1419..605b6e429b 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -1,4 +1,7 @@ FROM quay.io/travisci/travis-ruby +ENV DEBIAN_FRONTEND noninteractive +ENV LANG en_US.UTF-8 +ENV 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