lkml.org 
[lkml]   [2011]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[63/78] perf tools: Version incorrect with some versions of grep
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Josh Hunt <johunt@akamai.com>

    commit 58d406ed6a5f1ca4bc1dba5390b718c67847fa5f upstream.

    Some versions of grep don't treat '\s' properly. When building perf on such
    systems and using a kernel tarball the perf version is unable to be determined
    from the main kernel Makefile and the user is left with a version of '..'.
    Replacing the use of '\s' with '[[:space:]]', which should work in all grep
    versions, gives a usable version number.

    Reported-by: Tapan Dhimant <tdhimant@akamai.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Tapan Dhimant <tdhimant@akamai.com>
    Cc: linux-kernel@vger.kernel.org
    LKML-Reference: <1300241800-30281-1-git-send-email-johunt@akamai.com>
    Signed-off-by: Josh Hunt <johunt@akamai.com>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    tools/perf/util/PERF-VERSION-GEN | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/tools/perf/util/PERF-VERSION-GEN
    +++ b/tools/perf/util/PERF-VERSION-GEN
    @@ -23,10 +23,10 @@ if test -d ../../.git -o -f ../../.git &
    then
    VN=$(echo "$VN" | sed -e 's/-/./g');
    else
    - eval `grep '^VERSION\s*=' ../../Makefile|tr -d ' '`
    - eval `grep '^PATCHLEVEL\s*=' ../../Makefile|tr -d ' '`
    - eval `grep '^SUBLEVEL\s*=' ../../Makefile|tr -d ' '`
    - eval `grep '^EXTRAVERSION\s*=' ../../Makefile|tr -d ' '`
    + eval $(grep '^VERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
    + eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
    + eval $(grep '^SUBLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
    + eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../Makefile|tr -d ' ')

    VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}"
    fi



    \
     
     \ /
      Last update: 2011-03-22 00:29    [W:5.260 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site