Messages in this thread |  | | | Date | Fri, 10 Oct 2008 16:01:29 -0700 | | From | Andrew Morton <> | | Subject | Re: [PATCH] Prevent modpost from looking for a .cmd file for a static library linked into a module |
| |
On Tue, 7 Oct 2008 11:26:15 -0700 "Ashutosh Naik" <ashutosh@chelsio.com> wrote:
> > This patch prevents modpost to look for a .cmd file when a module is > linked with a static library > > Signed-off-by: Ashutosh Naik <ashutosh.naik@gmail.com>
What is the reason for this change?
Presumably there is some user-observeable behaviour which it corrects? What is it, and under what circumstances does it occur?
> diff -ruN linux-2.6.26.5/scripts/mod/sumversion.c > linux-2.6.26.5-mod/scripts/mod/sumversion.c > --- linux-2.6.26.5/scripts/mod/sumversion.c 2008-09-08 > 10:40:20.000000000 -0700 > +++ linux-2.6.26.5-mod/scripts/mod/sumversion.c 2008-10-07 > 09:32:24.000000000 -0700 > @@ -290,6 +290,15 @@ > release_file(file, len); > return 1; > } > +/* Check whether the file is a static library or not */ > +static int is_static_library(const char *objfile) > +{ > + int len = strlen(objfile); > + if((objfile[len -2]=='.') && (objfile[len - 1]=='a')) > + return 1; > + else > + return 0; > +} > > /* We have dir/file.o. Open dir/.file.o.cmd, look for deps_ line to > * figure out source file. */ > @@ -420,7 +429,7 @@ > while ((fname = strsep(&sources, " ")) != NULL) { > if (!*fname) > continue; > - if (!parse_source_files(fname, &md)) > + if (!(is_static_library(fname)) && > !parse_source_files(fname, &md)) > goto release; > }
The patch was wordwrapped. I fixed that and queued it for sending to Sam. Please send me an updated, complete changelog, thanks.
|  |