From patchwork Thu Jul 11 05:44:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168823 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914469ilk; Wed, 10 Jul 2019 22:46:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzm5glDByPjAvvA0cV0NzJodvXtU+2YUG0RufUCZQrkJEjfmJcFuEExHKG9KnKSPjnqvMgq X-Received: by 2002:a17:902:c509:: with SMTP id o9mr2628068plx.222.1562823992023; Wed, 10 Jul 2019 22:46:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823992; cv=none; d=google.com; s=arc-20160816; b=ZxKPjjjgqy4CgsdccmTqHOgGMHYGpHhAdMPwoY9UDtHk2b2fgZzrBVCspxcWax8ig3 ghyWobF4wG4frxkitsMW0KtohFVXmATipgNW8xywqnlNcuWU6ZVnjjL4ubJ+Gb7rswBZ dh+1I1JdcOi7tLMWcaPz1PpvrKW13CEoB9V2saIMvNIbS/uG2brGf60oilbimXJ6Uw0Z 0cEItV9V3EsRi+67yuQnPgnD86Wnw2T8jjXMSNYkpGuchQLa2VBWm580pUlfcy/JrDRt PLl3OWxMga4f/td65jyRiFe+0iAgPB0dyEuBA11mgU/kMBZmekBXlv+Y04dF3zLWjHKF 8g0w== 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=73BNt3XOxU/QtVB4UusmprlWYwd5Q4e7yWpAuZSG5uY=; b=eBPuwWyhzMJaP9nzvy8LPdLn4Gl2RKZPi6NnMXJZr62b9jB3MrpvAjHjKnXPF6cBs7 vfroBbF4cyp9Aj4/CkYyY/hLfwfKfAvbQw7/GFIGtzwJg0AJnfjBgy4JoR8SgvyDtYPV Mm99zHA7m/9eOpCGR9VNE4K+yEm3WdnRBqreFuGNIv1WRDX2j/MSxzCtWoQazMr7nmE9 uD7LTqvEvEbTQCsr3ix1UskztCo9wTTbqXTzXWm+2XOAymdGmuDeNU9GjRA3Z01ohlU4 z4d1RHGuO/QQy/Z42tAH43FPI/5o5wWbBJk2JTgyHWQhLSXzA+ii5gGXMbq6KnObjlmC vltg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=YCK5T9hS; 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 g17si3900449plo.406.2019.07.10.22.46.31; Wed, 10 Jul 2019 22:46:32 -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=YCK5T9hS; 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 S1728271AbfGKFqa (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:30 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59531 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727960AbfGKFpz (ORCPT ); Thu, 11 Jul 2019 01:45:55 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8N031345; Thu, 11 Jul 2019 14:44:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8N031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823894; bh=73BNt3XOxU/QtVB4UusmprlWYwd5Q4e7yWpAuZSG5uY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YCK5T9hStu+Tg1CcwBxF7RxNzvgQxSD8fZegCbPmyxjHMkTIzehtyWz21wLmdYItT 0xnfiBXXycLrcGRTX7bFIiWTZ+xvl5CJww5/lQDoRO0M5pu40AXZsC6ioXz4S8+3S2 iOKwUYQpMxAan67dXUrCZYmUVz1leCcEdb4f0zoKHRCRCIumcI+5iXgfj2U69fCJhh IbWA8/kyQjcW277Sr1/NHY6uTEYk4UkMUEgjJvhefpU+GOULQoA8dyCyPQkBTlkScH TfcniABve4vtENr0+/C0Oa6F1rPk+qbmog471lBrAha2kPWQviYShv0RhS9xAtNhr2 smX6TrK+sS1xA== 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 03/11] kbuild: remove duplication from modules.order in sub-directories Date: Thu, 11 Jul 2019 14:44:26 +0900 Message-Id: <20190711054434.1177-4-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 Currently, only the top-level modules.order drops duplicated entries. The modules.order files in sub-directories potentially contain duplication. To list out the paths of all modules, I want to use modules.order instead of parsing *.mod files in $(MODVERDIR). To achieve this, I want to rip off duplication from modules.order of external modules too. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/Makefile.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index f21d691c776a..98dede0b2ca8 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -423,13 +423,10 @@ endif # builtin-target # # Create commands to either record .ko file or cat modules.order from # a subdirectory -modorder-cmds = \ - $(foreach m, $(modorder), \ - $(if $(filter %/modules.order, $m), \ - cat $m;, echo $m;)) - $(modorder-target): $(subdir-ym) FORCE - $(Q)(cat /dev/null; $(modorder-cmds)) > $@ + $(Q){ $(foreach m, $(modorder), \ + $(if $(filter %/modules.order, $m), cat $m, echo $m);) :; } \ + | $(AWK) '!x[$$0]++' - > $@ # # Rule to compile a set of .o files into one .a file (with symbol table)