From patchwork Tue Mar 26 04:26:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161147 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4754260jan; Mon, 25 Mar 2019 21:27:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqxF5/5KH5TZkQIafa1xa7+O9QBxEws9zacUmXicI4zTrA0p32kTqqXbwUobPkEx1bat6rWR X-Received: by 2002:a65:62d6:: with SMTP id m22mr27492793pgv.443.1553574446247; Mon, 25 Mar 2019 21:27:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553574446; cv=none; d=google.com; s=arc-20160816; b=m7JDNHSQ3q7nKCS77D01ysY7qEyQhMA0cjEWHISeOOSMG1rqWE/lN2B5rrX+0qo2nD N8QDxlgd4LWzjwIGqv/bSWVF85lChbPmTr508J8HBCIxeY9rR/BS2iS0b9jvmW80E6kX UF2qZJmiCK2e8aM34Ju+TasEBB6kU4h0n3Umg1aFahC9y3uRq9/EFheZ1B1lb7UbINzU HCD5/x/MsOBH8oB40ZZMwCzsacw13mExbZb0qOAACtptlYpgtPqGunK5qdwPxBoUjBCM fm4QqdlCa7Wn9OUsWiSfzlb9N0+z/sSCKCfYUvaBIdytAhlyOaguwRnI4pDiK0PmRklZ e8dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=luaBYMoq4WHRW4hlBUkSayGbn0IoOPI5Kl//OZWr9Zg=; b=cpTpXqzBp6ACEfRC3bLtI5kMh/QZDVEATWhweFdxw0ORTV3ZOdOrODf0UgDapcLMLi kv4ufGCd5aAIeklNjqAySixtOcLMxZaSx98XD8lRKikEKfyiETFwTF623akKH4QHxTRQ f7LQAeQRJB63q0klf+1EhEbov0rNJfFUHJPJ/caGY6RhkDJs4SEZtss5EM/qJgzNS4wY m2CkwqyEVRE7JrCqSJ/klmXdoceBG4Z1dJXv080P1jLOUPXqpU7igRKoNvydrmGl+qRC 7nQ+R6zDuVFNo+soMH3evArgLQbnQsDbd7XvWaToHZFKBnpoaGdj39ViwMBbnQfslPRl l2nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=VVP0CUW9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i38si16324050plb.194.2019.03.25.21.27.25; Mon, 25 Mar 2019 21:27:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=VVP0CUW9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726480AbfCZE1Y (ORCPT + 31 others); Tue, 26 Mar 2019 00:27:24 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:56907 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725776AbfCZE1Y (ORCPT ); Tue, 26 Mar 2019 00:27:24 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x2Q4R5cf022680; Tue, 26 Mar 2019 13:27:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x2Q4R5cf022680 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1553574426; bh=luaBYMoq4WHRW4hlBUkSayGbn0IoOPI5Kl//OZWr9Zg=; h=From:To:Cc:Subject:Date:From; b=VVP0CUW9SUp2L0deEQyuLVk4Z6DPFoQXURh4sLlw+8f3wflI5yny7tebNNtWsUsh4 JoJ9vLZiWwkMGOod2/7+m8TKC32AHNrh2xxK3IlDK3mC84WuJSaBGJ9PxTNHX73TU8 befG44PU09DgTOByJrJTtvzUngQtJTKdcNiH9xPv5b+LkVx8AxATYm1dlqRLITjIH+ lSTpD90hZdAmo5WgNN1mhrvE1fnUBAL6gA18npQ8OjGrhZUINPK069KzPXNDkUz8jx j6091w8HeMbejLqEa4NmkpmczoAqO5rP1wND+Z73Gm/29WH5LQfrgz6XvmkeOr7q6w qM28DBof75qFQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Andre Przywara , Vladimir Kondratiev , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: do not overwrite .gitignore in output directory Date: Tue, 26 Mar 2019 13:26:58 +0900 Message-Id: <1553574418-21033-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 3a51ff344204 ("kbuild: gitignore output directory") seemed to bother people who version-control output directories. Andre Przywara says: "Unfortunately this breaks my setup, because I keep a totally separate git repository in my build directories to track (various versions of) .config. So .gitignore there is carefully crafted to ignore most build artefacts, but not .config, for instance." Link: https://lkml.org/lkml/2019/3/22/1819 Reported-by: Andre Przywara Signed-off-by: Masahiro Yamada --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 Tested-by: Andre Przywara Reviewed-by: Andre Przywara diff --git a/Makefile b/Makefile index 5fe5431..70fc778 100644 --- a/Makefile +++ b/Makefile @@ -499,7 +499,8 @@ outputmakefile: ifneq ($(KBUILD_SRC),) $(Q)ln -fsn $(srctree) source $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree) - $(Q){ echo "# this is build directory, ignore it"; echo "*"; } > .gitignore + $(Q)test -e .gitignore || \ + { echo "# this is build directory, ignore it"; echo "*"; } > .gitignore endif ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)