From patchwork Fri Mar 16 07:37:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 131911 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp411243ljb; Fri, 16 Mar 2018 00:38:47 -0700 (PDT) X-Google-Smtp-Source: AG47ELvv5G2NELZ0ubeJkjed4ab2+FpFrTjL8u/d2pP+0pHHZ1MR+9WDleVkZWbYUPsB4VefrHUB X-Received: by 2002:a17:902:8a94:: with SMTP id p20-v6mr1043183plo.74.1521185927390; Fri, 16 Mar 2018 00:38:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521185927; cv=none; d=google.com; s=arc-20160816; b=fO0G+8HMv4niw6EYl+MQ6WH5gDuLVUoHwf48n/72nYb2pS7GpnCFpL7Ct08BHGYDDY WS6xY7V3M4cMNhCxkNcSbLZZsQkFjOMiXcfmL8LEx3O64pqkIDn/arU4rdWCq2JcdNNa Wyos5ewlGcWe+WlQJSCo1mKv5pv8bQScWMdisooprpypTSe77ImXrnRb9p3EIkNkBlQE exMH5F0Dfc1BYzPGOedJMRr+x8WMlPrgHnNGPserFj+4n9Ao30SdEt+RQA7oX54/eF1Y XKR33UDrJEWhkB/3uBZAxBnE7YX12dgc+N/yaF6ekbwlJztOyTy48Y7gwGooYyRAlmWj lk9w== 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 :arc-authentication-results; bh=1kdTdAPniEP8Dj72NHrci14YJHfR4wLG8tKbFCHXd3o=; b=zsZUlAqtST7PnLsrrhnhfLxpnLIF6cMTcLJLZNm651vg41UpwHV0ltv0ZHXyDm6+4p O+w1c1KRXXZapjvWOrSI4rkkf2daxZ5/Q0fQJ++ubL4B0Ktfwzn3KKuwnRbHfO3eldQY IxdNd/8TcQYMA/WNfvhv1YJV6PbJTwd60QnvG0jud3ofmLaJ0Gc5apYV2cbgsNfVNMTf 086V30ulC/lCobKVmboC7H11wwbsa9o832jWUpd6BR9ZNgE5eEACkOjjAWm+9IIolil3 //OMVAj6w+xuWSdZYa1jKUTC0gbVZgkjeTYvGxNKpPRdWwvvUOMB4kM1FpWKHn19qD/R xxLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=WzDh8IYN; 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 e71si5119621pfc.276.2018.03.16.00.38.47; Fri, 16 Mar 2018 00:38:47 -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=WzDh8IYN; 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 S1753438AbeCPHio (ORCPT + 28 others); Fri, 16 Mar 2018 03:38:44 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:20832 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751624AbeCPHhs (ORCPT ); Fri, 16 Mar 2018 03:37:48 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w2G7bOa9029139; Fri, 16 Mar 2018 16:37:30 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w2G7bOa9029139 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521185850; bh=1kdTdAPniEP8Dj72NHrci14YJHfR4wLG8tKbFCHXd3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WzDh8IYN7QQJ5vxIWDk7JHnXzIoLvKH9rxTTXj6JUpWieCQgH6rlXyBEEPQrWHugc c48nyRLASrGYzLsRMu/Vea6R8LvIjxzjxdCr5HbGGeLsdJKgIBMg6Oge5I5EaXontV hOqRO8yfsmzaOMSiLuPqPxL3pRaec5Z5tSVG98Fjj8SV41jpkOZr1svS26AMY5y791 O31xwLG6hyqJelgIoykEySTDa5sbiZlcrVM0TtyQjKp6S8ApXovfeizu0gdJfVxOmR 8lHyeas0pQieMtBDy+fY0Ckmdgxvt0jo5zfmpFTuR7jG7vrmY1GVF+LMVqQhddenOQ /A8/O33Yt9W+w== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Michal Marek , Nicolas Pitre , linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH v4 6/7] kbuild: move include/config/ksym/* to include/ksym/* Date: Fri, 16 Mar 2018 16:37:14 +0900 Message-Id: <1521185836-19120-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521185836-19120-1-git-send-email-yamada.masahiro@socionext.com> References: <1521185836-19120-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 The idea of using fixdep was inspired by Kconfig, but autoksyms belongs to a different group. So, I want to move those touched files under include/config/ksym/ to include/ksym/. The directory include/ksym/ can be removed by 'make clean' because it is meaningless for the external module building. Signed-off-by: Masahiro Yamada Acked-by: Nicolas Pitre --- Changes in v4: None Changes in v3: None Changes in v2: - Rebase on linux-next (resolve a conflict to https://patchwork.kernel.org/patch/10204653/) .gitignore | 1 + Makefile | 2 +- scripts/Kbuild.include | 2 +- scripts/adjust_autoksyms.sh | 2 +- scripts/basic/fixdep.c | 8 ++++---- 5 files changed, 8 insertions(+), 7 deletions(-) -- 2.7.4 diff --git a/.gitignore b/.gitignore index 1be78fd..85bcc26 100644 --- a/.gitignore +++ b/.gitignore @@ -87,6 +87,7 @@ modules.builtin # include/config include/generated +include/ksym arch/*/include/generated # stgit generated dirs diff --git a/Makefile b/Makefile index ef42adb..5fee703 100644 --- a/Makefile +++ b/Makefile @@ -1338,7 +1338,7 @@ endif # CONFIG_MODULES # make distclean Remove editor backup files, patch leftover files and the like # Directories & files removed with 'make clean' -CLEAN_DIRS += $(MODVERDIR) +CLEAN_DIRS += $(MODVERDIR) include/ksym # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config usr/include include/generated \ diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index f9c2f07..cce31ee 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -366,7 +366,7 @@ ksym_dep_filter = \ $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ boot*|build*|cpp_its_S|*cpp_lds_S|dtc|host*|vdso*) : ;; \ *) echo "Don't know how to preprocess $(1)" >&2; false ;; \ - esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/KSYM_\1/p' + esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/_\1/p' cmd_and_fixdep = \ $(echo-cmd) $(cmd_$(1)); \ diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index e0dd0d5..f11cae6 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -80,7 +80,7 @@ sort "$cur_ksyms_file" "$new_ksyms_file" | uniq -u | sed -n 's/^#define __KSYM_\(.*\) 1/\1/p' | tr "A-Z_" "a-z/" | while read sympath; do if [ -z "$sympath" ]; then continue; fi - depfile="include/config/ksym/${sympath}.h" + depfile="include/ksym/${sympath}.h" mkdir -p "$(dirname "$depfile")" touch "$depfile" echo $((count += 1)) diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 449b68c..f387538 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -113,11 +113,11 @@ static void usage(void) /* * Print out a dependency path from a symbol name */ -static void print_config(const char *m, int slen) +static void print_dep(const char *m, int slen, const char *dir) { int c, i; - printf(" $(wildcard include/config/"); + printf(" $(wildcard %s/", dir); for (i = 0; i < slen; i++) { c = m[i]; if (c == '_') @@ -140,7 +140,7 @@ static void do_extra_deps(void) fprintf(stderr, "fixdep: bad data on stdin\n"); exit(1); } - print_config(buf, len - 1); + print_dep(buf, len - 1, "include/ksym"); } } @@ -208,7 +208,7 @@ static void use_config(const char *m, int slen) return; define_config(m, slen, hash); - print_config(m, slen); + print_dep(m, slen, "include/config"); } /* test if s ends in sub */