lkml.org 
[lkml]   [2020]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 15/29] modpost: allow to pass -i option multiple times remove -e option
Date
Now that there is no difference in the functionality of -i and -e,
they can be unified.

Make modpost accept the -i option multiple times, then remove -e.

I will reuse -e for a different purpose.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

Changes in v2: None

scripts/Makefile.modpost | 2 +-
scripts/mod/modpost.c | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 8321068abb31..a316095c843c 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -82,7 +82,7 @@ include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
# modpost options for external modules
MODPOST += \
-i Module.symvers \
- $(addprefix -e ,$(KBUILD_EXTRA_SYMBOLS)) \
+ $(addprefix -i ,$(KBUILD_EXTRA_SYMBOLS)) \
-o $(KBUILD_EXTMOD)/Module.symvers

endif
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 76599dd44bae..2ecf72a176cf 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2558,7 +2558,6 @@ int main(int argc, char **argv)
{
struct module *mod;
struct buffer buf = { };
- char *kernel_read = NULL;
char *missing_namespace_deps = NULL;
char *dump_write = NULL, *files_source = NULL;
int opt;
@@ -2567,13 +2566,9 @@ int main(int argc, char **argv)
struct ext_sym_list *extsym_start = NULL;
struct ext_sym_list **extsym_iter = &extsym_start;

- while ((opt = getopt(argc, argv, "i:e:mnsT:o:awENd:")) != -1) {
+ while ((opt = getopt(argc, argv, "i:mnsT:o:awENd:")) != -1) {
switch (opt) {
case 'i':
- kernel_read = optarg;
- external_module = 1;
- break;
- case 'e':
external_module = 1;
*extsym_iter = NOFAIL(calloc(1, sizeof(**extsym_iter)));
(*extsym_iter)->file = optarg;
@@ -2614,8 +2609,6 @@ int main(int argc, char **argv)
}
}

- if (kernel_read)
- read_dump(kernel_read);
while (extsym_start) {
struct ext_sym_list *tmp;

--
2.25.1
\
 
 \ /
  Last update: 2020-05-24 17:44    [W:0.141 / U:0.208 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site