kbuild: fix usage with directories containing '.o'
PATCH 1/1 kbuild: fix usage with directories containing '.o'
From: Daniel Mack <[email protected]>, me
modpost unconditionally searched for ".o" assuming this is always the suffix of the module. This fails in two cases:
a) when building external modules where any
directory include ".o" in the name.
One example is a directory named: .../cvs.alsa.org/...
b) when someone names a kernel directory so it contains ".o". One example is drivers/scsi/aic.ok/...
case b) was triggered by renaming the directory for aic7xxx, and modifying Makefile and Kconfig. This caused make modules to fail.
Sam
kbuild-fix-modpost.patch:
===== scripts/modpost.c 1.19 vs edited =====
scripts/modpost.c +8 -5
@@ -64,17 +64,20 @@ {struct module *mod;char *p; +size_t len; mod =NOFAIL (malloc (sizeof (*mod)));memset (mod,0 ,sizeof (*mod)); - mod->name =NOFAIL (strdup (modname)); + p =NOFAIL (strdup (modname)); -/* strip trailing .o */ - p =strstr (mod->name,".o" ); -if (p) - *p =0 ; + len =strlen (p); +/* strip trailing .o */ +if (len >2 && p[len-2 ] =='.' && p[len-1 ] =='o' ) + p[len -2 ] ='\0' ; +/* add to list */ + mod->name =NOFAIL (strdup (p)); mod->next = modules; modules = mod;