From patchwork Sat Mar 30 12:04:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161497 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3168507jan; Sat, 30 Mar 2019 05:04:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzCxZaHmHnoUCnLIOY3TM/ifuKJchjzd0603ljvyAlPo7xZgADjMzf9kF45ph4na6JM51qI X-Received: by 2002:a63:6605:: with SMTP id a5mr51141497pgc.372.1553947484819; Sat, 30 Mar 2019 05:04:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553947484; cv=none; d=google.com; s=arc-20160816; b=bZ9Iyo2eyC1P+OGQURAAx201bsVYQ5DWVZEpWr1fu2xLsMWH8ChYi9rXx1lQWiBcnf 3PuAGNGN7Q9dM1ZIaAeLxMrkYcc+fsQMYKejcm3x2k0WDqR3Wd5WwuFQMo/XJQ5T6Bxk FQXWHg8bFnRSn3Z09glpU93IfoO2uMSY5HVj+50k9hIZh1H1rvdvT6hAAu/9U1WxE18H 2mNWiSagOdXSnxI0QHY7LQHb6rJmvu+c3IWBcrdKlkUutwTKyAQkCK36a1nfoj6n5f4w KnaMCxTNcyp1IzZZfFLnW8iIoN61JywIP6jGaari49FLuS83UqXl+oR65roENItGGL5g wpiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=uVzljSN+7FodKIL08wsjW9LWqryQWeeomDXG3kJzSxw=; b=cH8mz/cWoXGIcQdQZYX3HGJD+Ntow1KFGz5e2g80DIxV51zgYCO37znDB3fifL4Q7P bXl7xWJ/8pa2soiU2r1FWSTrhDXXOOdeDBM8b6yxPcb0PDecPH2z4+yFYmnvNwCKlrmX LdQk8z98q/G2kpH6f2UPJebT/b5vzTOoCUzwITLDsXQgEy8X1zO/QAAZqmeMbjFTXgNQ Gvx81wMr0RTXoKvJEOrpBmotQzKUT7CuM/J0rNcMFPGSHHljZIANmnS4wGh2QKY3YQU8 lSaOaWd0om/v7etSIioQmYMdSZbKE39X6GQAApvIPeGBgPxv2cC2Yvu/Ri7yldW7V3C1 ZMOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=1f8uCkfF; 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 w2si4161227pgp.266.2019.03.30.05.04.44; Sat, 30 Mar 2019 05:04:44 -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=1f8uCkfF; 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 S1730741AbfC3ME3 (ORCPT + 31 others); Sat, 30 Mar 2019 08:04:29 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:36046 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730414AbfC3ME2 (ORCPT ); Sat, 30 Mar 2019 08:04:28 -0400 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-10.nifty.com with ESMTP id x2UC4MsP021262; Sat, 30 Mar 2019 21:04:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x2UC4MsP021262 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1553947465; bh=uVzljSN+7FodKIL08wsjW9LWqryQWeeomDXG3kJzSxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1f8uCkfF3pECtf0HJc5H88nAd4mEuW6N4TxjyK2jMBX8krDlSF8+rgHSPnbZNeOxC r04vf4QSIF8rP+iz2BOXXqf7oQP8TwmaZO8kiWwTByCNyxnbkfZR96BVbxyELB/lQt jSoxx8zc19d+xsMaSryBzz01DVO2r0BP0FHV0JUsBsOl0JqSs9sY1wnBP3Up7KPYSs UB6UviH4G+/+EQbFynGM9IBFun1a+2laN7bCdB5c4jTwpGMAZcANu7MoMRO9OodtYB xpuJoNAaQBFruGl1uvIktDGm5+1xVv2N8Tnh60HC7DWzWpwcgIRlkCHCiVUWgqrnma imMXBvcKVicnw== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 3/6] kbuild: mkmakefile: do not check the generated Makefile marker Date: Sat, 30 Mar 2019 21:04:15 +0900 Message-Id: <1553947458-8311-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553947458-8311-1-git-send-email-yamada.masahiro@socionext.com> References: <1553947458-8311-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This hunk was added to avoid accidental overwrite of the top Makefile in case O= points to the top of the source tree. As commit 4f1127e20437 ("kbuild: fix infinite make recursion"), it caused some troubles in the past because Kbuild assumes O= as out-of-tree build, while it actually works in the source tree. Now this works more properly; if O= points to the source directory, it is handled as in-tree build. So, this sanity check is unneeded. Signed-off-by: Masahiro Yamada --- scripts/mkmakefile | 6 ------ 1 file changed, 6 deletions(-) -- 2.7.4 diff --git a/scripts/mkmakefile b/scripts/mkmakefile index 412f13f..31de468 100755 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -7,12 +7,6 @@ # Usage # $1 - Kernel src directory -# Only overwrite automatically generated Makefiles -# (so we do not overwrite kernel Makefile) -if test -e Makefile && ! grep -q Automatically Makefile -then - exit 0 -fi if [ "${quiet}" != "silent_" ]; then echo " GEN Makefile" fi