aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2010-10-27 12:42:00 -0700
committerMichal Marek <mmarek@suse.cz>2010-10-28 00:07:45 +0200
commitc25f415751c0c5507561d997fe5f7f05f4342912 (patch)
tree61988f838a5a68b3526235bc4b8388ecde414a0f
parent03ee0c42a77fbf60bfa6b0eacaff30ae4e19fce8 (diff)
scripts/namespace.pl: fix wrong source path
File::Find will do chdir automatically, so we need to get the absolute patch with $File::Find::dir. Reported-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Amerigo Wang <amwang@redhat.com> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rwxr-xr-xscripts/namespace.pl8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/namespace.pl b/scripts/namespace.pl
index 361d0f71184..fb4e2456073 100755
--- a/scripts/namespace.pl
+++ b/scripts/namespace.pl
@@ -167,11 +167,11 @@ sub do_nm
printf STDERR "$fullname is not an object file\n";
return;
}
- ($source = $fullname) =~ s/\.o$//;
- if (-e "$objtree$source.c" || -e "$objtree$source.S") {
- $source = "$objtree$source";
+ ($source = $basename) =~ s/\.o$//;
+ if (-e "$source.c" || -e "$source.S") {
+ $source = "$objtree$File::Find::dir/$source";
} else {
- $source = "$srctree$source";
+ $source = "$srctree$File::Find::dir/$source";
}
if (! -e "$source.c" && ! -e "$source.S") {
# No obvious source, exclude the object if it is conglomerate