From patchwork Thu Jul 11 05:44:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168816 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914091ilk; Wed, 10 Jul 2019 22:46:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYSoJJ8smrqxnU8ib5UrMRlx48Q32zaTNmrMdpEV5y3wJDhMmn7oQ2Ybf5gpP5QwpdqcY4 X-Received: by 2002:a65:6401:: with SMTP id a1mr2497128pgv.42.1562823966365; Wed, 10 Jul 2019 22:46:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823966; cv=none; d=google.com; s=arc-20160816; b=REAdYkThYydBInsK+XX2A8OGexYxirXI75MPW3QGF+Q5X57/W2ARQuc0xBsiz39K/Y 73OaIgtvI+1HZdIIuTcMGwTcvrDz0PCFsZVauJU6g1RJA9bI5nCQ8JZQ/7tEy4txwhTn ZYiCN9KuFaEl6YgRbR4gt/Q1/HZ3Rg1okJIAdxZS4+3UEIw5bMW74tL9g4/hUsPFG06v sUn1Nsq17vx4/lEnAw/34XeuH2uenRNvT3sHmIp1Q6nm8DWAEmFzZv2fSTucpxst0zLT kPlAcUMa2D5I9BbcnMiNKx5+pqEl5NVUXbbu0Ho2HPAKwSAT0hdAxtRj7bMGoeUAwxl9 Ty7g== 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=3stWZci9Q+1wdEeQ+22mZim0UiOILKQPDAUatPWkXUI=; b=MMZ6guCbE8cq0RHMq9SHXs2LyO/DgIpTyWYf3x4WSBNbJh3xzBv+/eEj51utFesDZw Pn90Cghp2BUNG547GYD0GjOHTjyT0qcgJrOlPs5QvP1bueTJPQdLa/Hev3r3zpDoqypc HcN3WLFJ7HxLk+sDtcYu3MIsT6sGkD4ijyGlL7MOeCu/da2s+T0ZWpcMtUZD33xwDqV8 18DbRvHfG1u4srxvCaMh5e2ERC28F7FINYzDQnnjryE7uDkUeUyMA/qEhqBsWRL4vwi5 4OvQDPSXK++dhl0rK3gtbuBGdeG+PU2xejcXZ+s6J4gmNWDP0gO47lgaq2G904kjqX7V tJ8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=zzCfgYA1; 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 q2si4096926pjq.89.2019.07.10.22.46.06; Wed, 10 Jul 2019 22:46:06 -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=zzCfgYA1; 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 S1728142AbfGKFqF (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:05 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59469 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727785AbfGKFpx (ORCPT ); Thu, 11 Jul 2019 01:45:53 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8R031345; Thu, 11 Jul 2019 14:44:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8R031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823897; bh=3stWZci9Q+1wdEeQ+22mZim0UiOILKQPDAUatPWkXUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zzCfgYA12HxNWflkTTSLjdaoGUyyLL9M/njlyZm5txsFXwvgJ74ShigkKw5imyZss kj8ERkblQ7mqx44PHmO/10pfcCrbHP5C/I9wot+jrNFccigeDUKEnwI04V+fgBncmL RFD4T5FPwZVADdTjjOw5g4GNWzpH+f6O7a5KIby/9/DHMvVBZ1t5CXpuE1bcFvCDv1 B9COiiUpEIyfHCm4A1D3SVkjPGegRCEiJiDVrbEW8klESO24PwaNQyujT+yJyhVqVj b1pEjy1iPZmi52NbIXi0UIkMjHpL/b8CmEV9dE8qeFlVDFMl+/sWdQm/YPGlzlVjSR OwrXibzngaTQQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 07/11] kbuild: modpost: read modules.order instead of $(MODVERDIR)/*.mod Date: Thu, 11 Jul 2019 14:44:30 +0900 Message-Id: <20190711054434.1177-8-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Towards the goal of removing MODVERDIR, read out modules.order to get the list of modules to be processed. This is simpler than parsing *.mod files in $(MODVERDIR). For external modules, $(KBUILD_EXTMOD)/modules.order should be read. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/Makefile.modpost | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index fec6ec2ffa47..2ab1694a7df3 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -8,9 +8,10 @@ # b) A .o file which is the .o files above linked together # c) A .mod file in $(MODVERDIR)/, listing the name of the # the preliminary .o file, plus all .o files +# d) modules.order, which lists all the modules # Stage 2 is handled by this file and does the following -# 1) Find all modules from the files listed in $(MODVERDIR)/ +# 1) Find all modules listed in modules.order # 2) modpost is then used to # 3) create one .mod.c file pr. module # 4) create one Module.symvers file with CRC for all exported symbols @@ -60,10 +61,10 @@ include scripts/Makefile.lib kernelsymfile := $(objtree)/Module.symvers modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers -# Step 1), find all modules listed in $(MODVERDIR)/ -MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u -__modules := $(shell $(MODLISTCMD)) -modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) +modorder := $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/)modules.order + +# Step 1), find all modules listed in modules.order +modules := $(sort $(shell cat $(modorder))) # Stop after building .o files if NOFINAL is set. Makes compile tests quicker _modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules)) @@ -84,7 +85,7 @@ MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS))) # We can go over command line length here, so be careful. quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules - cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) $(MODPOST_OPT) -s -T - + cmd_modpost = sed 's/ko$$/o/' $(modorder) | $(modpost) $(MODPOST_OPT) -s -T - PHONY += __modpost __modpost: $(modules:.ko=.o) FORCE