From patchwork Tue Sep 18 08:45:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 146886 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4760500ljw; Tue, 18 Sep 2018 01:46:23 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaFB83xRwR6sXM3YglAK+Rtq1qinkUR6xobGHUL1IMx157n1HVogmhaSgdctz3gAom6Q77d X-Received: by 2002:a62:4e56:: with SMTP id c83-v6mr30071798pfb.240.1537260383823; Tue, 18 Sep 2018 01:46:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537260383; cv=none; d=google.com; s=arc-20160816; b=C1rv8DZRN7hYoIuRlLdN4KB83Y42FWLan4bg8kLnGjwrxtAD1geZ9//0tjEU9H4XSK tDYkeRSSV5SYltXVjRrS6+kzQVNwevfSBxobX8GpNIB44a4YmpbSD+oYtt+0tfwxQT4A ESATv2hlJSlHGwFYxPCf+PW4nkv5T1oSBZpoSSeDxTK6N3+v/EfAVBJ4x9zbEb083/hv E2pEsi2ohoaFVJJWrs4AtC5Rx1J1VsAPThFkuLfckrirD8okqAmNPifLydfzDNnZQSRp aCOCBeggN0yRqDbhsqpaCQ0Zq9byLjnNobJ5xe3E+CQPrps8kSFO1wiYZklWZ2b1awzL KDcg== 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=oc89FkiRS8fOvTIsgqiQMWyosxvDE18DMW1VoU1FMUk=; b=pjD9Hthq0SeYiMgoF0Zj7O54JSi/RAE9UE7jUoP8PddyyJIq+hWBI47mb0wDIEzIP+ Zku1/EOr15z5fIkMLsLo8pLlH0FORDTEa85AhQCjqU1isrxB3Hw2wwTokPuakDxlARfB 8aj9BsXFThwb9S1hY4j6HmbJo8cEE//i9u2NsFz1qvBsE9JvQ8rJo6xJ67U9wXDVzsu/ xm1gtXWk7oNyLV6pCtfirlcYoUrW4Uhgp7Fh5sqb2bo3uh7FLCRHf311f+e3/TzzgoMi hXp81HIetMLBYO4+rVyI8bYUcqjWeno7c5MKi7XekMSA4zRAos0sHpjHpwEDKHMvCcM1 Accg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=fZzgtvoE; 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 m9-v6si17136562plt.478.2018.09.18.01.46.23; Tue, 18 Sep 2018 01:46:23 -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=fZzgtvoE; 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 S1729524AbeIROR5 (ORCPT + 32 others); Tue, 18 Sep 2018 10:17:57 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:55702 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729250AbeIROR5 (ORCPT ); Tue, 18 Sep 2018 10:17:57 -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 w8I8juLQ029470; Tue, 18 Sep 2018 17:45:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w8I8juLQ029470 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1537260357; bh=oc89FkiRS8fOvTIsgqiQMWyosxvDE18DMW1VoU1FMUk=; h=From:To:Cc:Subject:Date:From; b=fZzgtvoEI8HQFXTrv2gJvY+IRd1wnTVjq+Ze1YP9RZpLpx06iQ7THljTCzLe9TSH0 U2LWfNlvmlq97FTQ/jnil1cc0hEAaa7o4FdntOg2T6f+FV12yclQxX1SUTc1V7l4MQ NNmGIWssAeSgU5jGkfzuW+J/btKej3f/B4rZu0ALu/MJxyMiZ2p9+WcFA456VnKSfD FchFaERglfr8WFTy7TDGYbHXbzrNFomeuZndXK8J6+OT9mTFREMDJaVAKfti2kWzpb /IEA/W4tyrY5RhWryS9x6eLmiKEvmyO2mslu657hL6C4tm14QJ+6tLh1sPlvnk3twe irUZspLbb0TeA== 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 1/4] kbuild: remove VERSION and PATCHLEVEL from $(objtree)/Makefile Date: Tue, 18 Sep 2018 17:45:51 +0900 Message-Id: <1537260354-30082-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 Neither VERSION nor PATCHLEVEL is used in any useful way. Signed-off-by: Masahiro Yamada --- Makefile | 3 +-- scripts/mkmakefile | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index d2976b5..6e1a059 100644 --- a/Makefile +++ b/Makefile @@ -482,8 +482,7 @@ PHONY += outputmakefile outputmakefile: ifneq ($(KBUILD_SRC),) $(Q)ln -fsn $(srctree) source - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ - $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree) $(objtree) endif ifeq ($(cc-name),clang) diff --git a/scripts/mkmakefile b/scripts/mkmakefile index e19d656..e2106444 100755 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -7,9 +7,6 @@ # Usage # $1 - Kernel src directory # $2 - Output directory -# $3 - version -# $4 - patchlevel - test ! -r $2/Makefile -o -O $2/Makefile || exit 0 # Only overwrite automatically generated Makefiles @@ -25,9 +22,6 @@ fi cat << EOF > $2/Makefile # Automatically generated by $0: don't edit -VERSION = $3 -PATCHLEVEL = $4 - lastword = \$(word \$(words \$(1)),\$(1)) makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST))) From patchwork Tue Sep 18 08:45:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 146889 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4760664ljw; Tue, 18 Sep 2018 01:46:36 -0700 (PDT) X-Google-Smtp-Source: ANB0VdayXnF9d7Wv2oGio857TZs+iHPh1ndOKYUqX1EYNb1jbircyKetK3NUkS/4Cx9+scouObzV X-Received: by 2002:a63:2d05:: with SMTP id t5-v6mr27003592pgt.403.1537260396426; Tue, 18 Sep 2018 01:46:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537260396; cv=none; d=google.com; s=arc-20160816; b=SoIFt99y+HTd4J213aZzau/l7TWWwaKbibUHrNZpYDFdL7sp2HVxKs494lMx5HxH+u zbQbZemOJ7IK+jOSNegdGxaz+Ic8fr7E3P8VHSjdfsYTJp7+e6Dm2zRO3/AGtBfSnsnE Q5ldmAQ21+4sPH0znkfxeESc028HHj+ZM7JNYzCrLZxm7ADibRieBGLkmdyE+YV3V+my AMqOI+gMXsuqZIEd4pcw7PvevB+R6LwTBIExT1siVk97SmM+ZbJPVvCrAE3RZwcBPbpP 7Vci43ioFuXiVUXQMTai0snIMwVOJ9MtB1TgoOfQ5HHawggEXxv3LbhQatqisMWJdgzG mWQQ== 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=tpqAk1tRE54kXw4Ec4Ttm2Zhd5ozu9gJ+O1B/hU+QsM=; b=zI8RqD5kF4MMCcJ2mOMEi1X9ek7wxXnQmP6W5ksyIUoqfqJpsq2A8g3XMoX1r683TV mGcAE66qlh2xW4lVrLVbHeZe+XCmQ5IWeRwqVKPJPUzLpMMH9SCQz3pYB3iY/6y4Ci+Z jThTUq8za8fJqdnoMxJo5H3xwojubVL9/TwNhK8VQfEJ7FeBvFcg9Go0JhW74KiSKxgV x9w2axLfLqKatNbcX1nofyB3ymrujGKZJvCkBH1SRJONb1HAEIZnDjFk29yX94qUMJH2 l+wpIe9XLgtdhjdIXPMERN/ZFKVW4Y5TSzpmNBnj83Dc8Ip8N6CPiUDzE07Zn4tRd3R3 ++7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=d1v74CtG; 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 o137-v6si19939930pfg.362.2018.09.18.01.46.36; Tue, 18 Sep 2018 01:46:36 -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=d1v74CtG; 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 S1729549AbeIROR7 (ORCPT + 32 others); Tue, 18 Sep 2018 10:17:59 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:55700 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729238AbeIROR6 (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 w8I8juLR029470; Tue, 18 Sep 2018 17:45:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w8I8juLR029470 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1537260358; bh=tpqAk1tRE54kXw4Ec4Ttm2Zhd5ozu9gJ+O1B/hU+QsM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d1v74CtGFJeP8/UF4eD0/R2oSHnqUjcF4Pie6pqXlkd+Miklc21KED7QxDnLDbTfI P17FFsc/2b79Xah38ch6HKRfPlV69bOrl0x9g0a6CD4hvjjC+cKKIsZC3yffxMpLJz D1KU//qJXk8/X3mEDh8aasYKC9CEndZavCiU1HxgFbBKPFGh9/oBiPYIVVYPR1uIHL Ltm9kBsMwQON2KKOm5+qu0OgM4qgQY3gjwvsG7m9YsnLgXOZ0NdFAvQVJR20Uexd2n 7Nra9iWsCT97AhMyJJyJ9cfjUJzfJztVPJcKJ5NX4LjcfoqBrk8WFBV+HXFaBfd3e7 VwnfA/4sFZ75w== 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 2/4] kbuild: remove user ID check in scripts/mkmakefile Date: Tue, 18 Sep 2018 17:45:52 +0900 Message-Id: <1537260354-30082-2-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This line was added by commit fd5f0cd6b0ce ("kbuild: Do not overwrite makefile as anohter user"). Its commit description says the intention was to prevent $(objtree)/Makefile from being owned by root when e.g. running 'make install'. However, as commit 19514fc665ff ("arm, kbuild: make "make install" not depend on vmlinux") stated, installation targets must not modify the source tree in the first place. If they do, we are already screwed up. We must fix the root cause. Installation targets should just copy files verbatim, hence we never expect $(objtree)/Makefile is touched by root. The user ID check in scripts/mkmakefile is unneeded. Signed-off-by: Masahiro Yamada --- scripts/mkmakefile | 1 - 1 file changed, 1 deletion(-) -- 2.7.4 diff --git a/scripts/mkmakefile b/scripts/mkmakefile index e2106444..2435428 100755 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -8,7 +8,6 @@ # $1 - Kernel src directory # $2 - Output directory -test ! -r $2/Makefile -o -O $2/Makefile || exit 0 # Only overwrite automatically generated Makefiles # (so we do not overwrite kernel Makefile) if test -e $2/Makefile && ! grep -q Automatically $2/Makefile 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: 146887 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4760516ljw; Tue, 18 Sep 2018 01:46:25 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdby7n3q/VDGy26BWKM09s0klDK+NjbIodt38xffQxA8IrOIMO5f5XUp/bpkVbtgwgSpJqZI X-Received: by 2002:a17:902:4d46:: with SMTP id o6-v6mr713013plh.59.1537260385564; Tue, 18 Sep 2018 01:46:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537260385; cv=none; d=google.com; s=arc-20160816; b=coLX4aXEvJYbl2NMhkBFxoOaGyJL1fGEVAB8Hn2zsjzfRI6pQ7Ngb+0sfT0HcNtL/V k0tUYULdcQIhzbK/1EasUUfsfszGSiuRPk+tGFJ8Hr/L6NWdo87OwUwsYSo5/OJ5gThe DRfazm/m4gkX89g3Gi++vmqcPJVdmGigdmxHONpxGVumwmLWpqPQRza5CK3PYFT491NB ltuwNAkq3vQjxPQVzyN2PJDAR/yvfxsZO/jvIwHt0VI6KC0h5AjlgamWyAQXbJi/ZZv+ YJ2nB6NVwStXotMTQfWqQl0UoQ945eUgZVFtLVNIQGkZNxX4fXbNRomEbOgS3Q/xLyqg TVcA== 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=tj2rDC3SWOGJr3wJdUY3fa/p8CdfSaT2qhILVPE4uOE=; b=sn6GxzCduDhNoUw8cnKe9LjfqUP5PlgUYOysEcJIeOKEXBszwjyaYfjRamfuFwnAkS XREGifz/tNjgBveCuyLMpVOLPvBVOm98c4EhTokEC5GfSWtvjVhWBsm68hc2ZG5ry9vV mvc7xWgWskWpY+4xY16TlelWk3HSE5wWn49XUGXUdrq0Z2w6073BYYRCNgdyEl38nqWC yuMbVyZWWCIaWLgCh5UWHfyO5uv08RFXzNjAzjOO1K97H1XihMWFr6yYceEWzN+pFXQ9 zqPe6/O94c/JzpIZ/eHdpDhnS33NWY6szUKgxppmnfwMZRky3bu6LyjkuAQoK2xekl9q SZkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=HMJavHzZ; 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 m9-v6si17136562plt.478.2018.09.18.01.46.25; Tue, 18 Sep 2018 01:46:25 -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=HMJavHzZ; 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 S1729588AbeIROR7 (ORCPT + 32 others); 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.7.4 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)) From patchwork Tue Sep 18 08:45:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 146888 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4760584ljw; Tue, 18 Sep 2018 01:46:31 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZd6NIkFDXt09MoSnf0blFLaVueOfYJf1tJHFc76/77Lv/dG9xchJ7WHnQT+zWC8Ry1dxfH X-Received: by 2002:a63:d002:: with SMTP id z2-v6mr27195175pgf.262.1537260391838; Tue, 18 Sep 2018 01:46:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537260391; cv=none; d=google.com; s=arc-20160816; b=a0FfkUFa4cyRrPbMWoplcg4mHxwi4fUVfYpGgd+2rLEm6qNcU+fgL7YwJV2NtiqE44 M0dMVfqTHysoLteAPYkgijqjD71gXHBurH/IL1dnWLYqPOCQXhIukyNC6GBJA30tGnap D7VTwcxl8KwsXo/P4f1HT7POnmAHYM0z2HljTLzukTlwegcQ6wtAeVnuQlfc3qUSisKa j0FQPOYnZcPCyaft1KmPSnyySDyEOmrlCUG/j7e6YtewQ+IELEAVRtSIoljWw0OUiI44 zPwW8x6oCSmfr0qS0GYx9rtJjVq6S5XB8jkCbkXtx+ZwVZJATdulveMGNWU1d7pM1CeC iGJQ== 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=8QvWQPQnnkID6eS2uCqPUDx2wVrHT/2j5vswBJskWpU=; b=dyYyz+WmRCvN83f7pw2BI6+FoHbe5FoVIfcbSkTnD3+HbNygA1t6VizDmaEt0Su4si BN9zcKVelGqUbA1cH0VT/6YRQ+0ONjEoOtnen00W395v5vtNk2H14rYh8Yupyx48QIIz ghkTtUwIs+lb54sujlx6h22LaSIetHkbnNJ0cd6SM5tvs8LBMmLz0lc7c7+S9EW3OBfX eJQnf9eo70AE1f1Csl8ko/fMOZH/BqE8BiSA8cUj9Sy4pZkhkLR5VUgI4KTd/SpCGDVK jCIa76bFCIowMmbwtXnIzLXnaxcxDVkJlakXlxqUtbFUpHYgICz68Cd/ubuQpwzKQV2I n+PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=zJ55wceY; 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 o137-v6si19939930pfg.362.2018.09.18.01.46.31; Tue, 18 Sep 2018 01:46:31 -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=zJ55wceY; 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 S1729569AbeIROR7 (ORCPT + 32 others); Tue, 18 Sep 2018 10:17:59 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:55703 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729316AbeIROR6 (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 w8I8juLT029470; Tue, 18 Sep 2018 17:45:58 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w8I8juLT029470 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1537260359; bh=8QvWQPQnnkID6eS2uCqPUDx2wVrHT/2j5vswBJskWpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zJ55wceY2mLsd/+EjxLcsx2yZERv+sopitEKQ/nCbQOrQmxsY4kEwpai3ke7FOAxP IZQ9wHv1ofbD6OtoidthOS23dLJVzwSfEu7iGZizLgNZdmAuyZ1LHGdCclkW/+7RHh 86dlGhKbrcZIcTKxBGlfGDTzFlvOFZO/wLORJNPml+ZHxpnJy0lEli9DcqBlJK67hz BK6A3NaNtD8SxlqzkwSyTCaBbPlLrMByovUDC58AVB5zU71+AJW7FEqz7rBFrh6jzX 5drsYBzVavADmaCp8DPiPj5xSGTzv2sTTb8gOKKN9yo8I0RgTvMYGfbzGc1uUEurWN P6zc0oSAYCmjA== 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 4/4] kbuild: simplify command line creation in scripts/mkmakefile Date: Tue, 18 Sep 2018 17:45:54 +0900 Message-Id: <1537260354-30082-4-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Assuming we never invoke the generated Makefile from outside of the $(objtree) directory, $(CURDIR) points to the absolute path of $(objtree). BTW, 'lastword' is natively supported by GNU Make 3.81+, which is the current requirement for building the kernel. Signed-off-by: Masahiro Yamada --- scripts/mkmakefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) -- 2.7.4 diff --git a/scripts/mkmakefile b/scripts/mkmakefile index 85995f9..412f13f 100755 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -20,9 +20,6 @@ fi cat << EOF > Makefile # Automatically generated by $0: don't edit -lastword = \$(word \$(words \$(1)),\$(1)) -makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST))) - ifeq ("\$(origin V)", "command line") VERBOSE := \$(V) endif @@ -30,15 +27,12 @@ ifneq (\$(VERBOSE),1) Q := @ endif -MAKEARGS := -C $1 -MAKEARGS += O=\$(if \$(patsubst /%,,\$(makedir)),\$(CURDIR)/)\$(patsubst %/,%,\$(makedir)) - MAKEFLAGS += --no-print-directory .PHONY: __sub-make \$(MAKECMDGOALS) __sub-make: - \$(Q)\$(MAKE) \$(MAKEARGS) \$(MAKECMDGOALS) + \$(Q)\$(MAKE) -C $1 O=\$(CURDIR) \$(MAKECMDGOALS) \$(filter-out __sub-make, \$(MAKECMDGOALS)): __sub-make @: