diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2022-12-11 22:04:07 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2022-12-14 15:42:40 +0900 |
| commit | f65a486821cfd363833079b2a7b0769250ee21c9 (patch) | |
| tree | e80172fa864beca08f6ca876eff2f523128782a0 /scripts/mod | |
| parent | 875ef1a57f32fcb91010dc9bc8bd1166956a579e (diff) | |
| download | linux-stable-f65a486821cfd363833079b2a7b0769250ee21c9.tar.gz linux-stable-f65a486821cfd363833079b2a7b0769250ee21c9.tar.bz2 linux-stable-f65a486821cfd363833079b2a7b0769250ee21c9.zip | |
kbuild: change module.order to list *.o instead of *.ko
scripts/Makefile.build replaces the suffix .o with .ko, then
scripts/Makefile.modpost calls the sed command to change .ko back
to the original .o suffix.
Instead of converting the suffixes back-and-forth, store the .o paths
in modules.order, and replace it with .ko in 'make modules_install'.
This avoids the unneeded sed command.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Diffstat (limited to 'scripts/mod')
| -rw-r--r-- | scripts/mod/modpost.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 56d856f2e511..b48838a71bf6 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1856,11 +1856,9 @@ static void read_symbols_from_files(const char *filename) FILE *in = stdin; char fname[PATH_MAX]; - if (strcmp(filename, "-") != 0) { - in = fopen(filename, "r"); - if (!in) - fatal("Can't open filenames file %s: %m", filename); - } + in = fopen(filename, "r"); + if (!in) + fatal("Can't open filenames file %s: %m", filename); while (fgets(fname, PATH_MAX, in) != NULL) { if (strends(fname, "\n")) @@ -1868,8 +1866,7 @@ static void read_symbols_from_files(const char *filename) read_symbols(fname); } - if (in != stdin) - fclose(in); + fclose(in); } #define SZ 500 |