From patchwork Tue Sep 18 08:45:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10603861 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B51A613AD for ; Tue, 18 Sep 2018 08:46:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A62562A6C1 for ; Tue, 18 Sep 2018 08:46:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9951C2A6CA; Tue, 18 Sep 2018 08:46:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 496C42A6C1 for ; Tue, 18 Sep 2018 08:46:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729316AbeIROR7 (ORCPT ); Tue, 18 Sep 2018 10:17:59 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:55701 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729192AbeIROR6 (ORCPT ); Tue, 18 Sep 2018 10:17:58 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id w8I8juLS029470; Tue, 18 Sep 2018 17:45:58 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w8I8juLS029470 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1537260358; bh=tj2rDC3SWOGJr3wJdUY3fa/p8CdfSaT2qhILVPE4uOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HMJavHzZxwnpbmVY0l8Jkpm+jPaGV4inLTD/7hAmqWlPLNfXu0Zp7sPYx4Juz+lHa WpEPdjYykXXaUi8qWE0PbNTdYqOusKm5hvidYCIZcHdNGY6LV0h/Gz823S6rA43vq8 Rr+Qof73w7cV4ID3cmUn66T8FC+RIGPZ3zCUz0XA7Q0Ck6GcHv6yN/MhrkMIJ+1SQw H3/StEs0AYQRpdMauI08Qib6bSn9AjTd5ZzUZIgh2NDYOzFYkmgZ8BwPmJkQB40UVG FI1PFEo8USTZ0oRc2AC1+NoTsN+dpJHG8al7qiUq45+cDXIrsNnQVdils3ZRn3KYcB kSvur4gFGpZew== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] kbuild: do not pass $(objtree) to scripts/mkmakefile Date: Tue, 18 Sep 2018 17:45:53 +0900 Message-Id: <1537260354-30082-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537260354-30082-1-git-send-email-yamada.masahiro@socionext.com> References: <1537260354-30082-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since $(objtree) is always '.', it is not useful to pass it to scripts/mkmakefile. I assume nobody wants to run this script directly. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- scripts/mkmakefile | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 6e1a059..3799bc5 100644 --- a/Makefile +++ b/Makefile @@ -482,7 +482,7 @@ PHONY += outputmakefile outputmakefile: ifneq ($(KBUILD_SRC),) $(Q)ln -fsn $(srctree) source - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree) $(objtree) + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree) endif ifeq ($(cc-name),clang) diff --git a/scripts/mkmakefile b/scripts/mkmakefile index 2435428..85995f9 100755 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -6,19 +6,18 @@ # Usage # $1 - Kernel src directory -# $2 - Output directory # Only overwrite automatically generated Makefiles # (so we do not overwrite kernel Makefile) -if test -e $2/Makefile && ! grep -q Automatically $2/Makefile +if test -e Makefile && ! grep -q Automatically Makefile then exit 0 fi if [ "${quiet}" != "silent_" ]; then - echo " GEN $2/Makefile" + echo " GEN Makefile" fi -cat << EOF > $2/Makefile +cat << EOF > Makefile # Automatically generated by $0: don't edit lastword = \$(word \$(words \$(1)),\$(1))