lkml.org 
[lkml]   [2019]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 056/197] namespace: fix namespace.pl script to support relative paths
    Date
    From: Jacob Keller <jacob.e.keller@intel.com>

    [ Upstream commit 82fdd12b95727640c9a8233c09d602e4518e71f7 ]

    The namespace.pl script does not work properly if objtree is not set to
    an absolute path. The do_nm function is run from within the find
    function, which changes directories.

    Because of this, appending objtree, $File::Find::dir, and $source, will
    return a path which is not valid from the current directory.

    This used to work when objtree was set to an absolute path when using
    "make namespacecheck". It appears to have not worked when calling
    ./scripts/namespace.pl directly.

    This behavior was changed in 7e1c04779efd ("kbuild: Use relative path
    for $(objtree)", 2014-05-14)

    Rather than fixing the Makefile to set objtree to an absolute path, just
    fix namespace.pl to work when srctree and objtree are relative. Also fix
    the script to use an absolute path for these by default.

    Use the File::Spec module for this purpose. It's been part of perl
    5 since 5.005.

    The curdir() function is used to get the current directory when the
    objtree and srctree aren't set in the environment.

    rel2abs() is used to convert possibly relative objtree and srctree
    environment variables to absolute paths.

    Finally, the catfile() function is used instead of string appending
    paths together, since this is more robust when joining paths together.

    Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
    Acked-by: Randy Dunlap <rdunlap@infradead.org>
    Tested-by: Randy Dunlap <rdunlap@infradead.org>
    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    scripts/namespace.pl | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    diff --git a/scripts/namespace.pl b/scripts/namespace.pl
    index 6135574a6f394..1da7bca201a42 100755
    --- a/scripts/namespace.pl
    +++ b/scripts/namespace.pl
    @@ -65,13 +65,14 @@
    use warnings;
    use strict;
    use File::Find;
    +use File::Spec;

    my $nm = ($ENV{'NM'} || "nm") . " -p";
    my $objdump = ($ENV{'OBJDUMP'} || "objdump") . " -s -j .comment";
    -my $srctree = "";
    -my $objtree = "";
    -$srctree = "$ENV{'srctree'}/" if (exists($ENV{'srctree'}));
    -$objtree = "$ENV{'objtree'}/" if (exists($ENV{'objtree'}));
    +my $srctree = File::Spec->curdir();
    +my $objtree = File::Spec->curdir();
    +$srctree = File::Spec->rel2abs($ENV{'srctree'}) if (exists($ENV{'srctree'}));
    +$objtree = File::Spec->rel2abs($ENV{'objtree'}) if (exists($ENV{'objtree'}));

    if ($#ARGV != -1) {
    print STDERR "usage: $0 takes no parameters\n";
    @@ -231,9 +232,9 @@ sub do_nm
    }
    ($source = $basename) =~ s/\.o$//;
    if (-e "$source.c" || -e "$source.S") {
    - $source = "$objtree$File::Find::dir/$source";
    + $source = File::Spec->catfile($objtree, $File::Find::dir, $source)
    } else {
    - $source = "$srctree$File::Find::dir/$source";
    + $source = File::Spec->catfile($srctree, $File::Find::dir, $source)
    }
    if (! -e "$source.c" && ! -e "$source.S") {
    # No obvious source, exclude the object if it is conglomerate
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-10-27 22:20    [W:7.552 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site