lkml.org 
[lkml]   [2012]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/15] perf tools: Make --version show kernel version instead of pull req tag
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    Before:

    $ perf --version
    perf version perf.urgent.for.mingo.5.g37da28

    After:

    $ perf --version
    perf version 3.4.8941.g37da28.dirty

    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Namhyung Kim <namhyung@gmail.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/n/tip-vc9b4e6023iegz9kabr3yvyv@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/PERF-VERSION-GEN | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
    index ad73300..95264f3 100755
    --- a/tools/perf/util/PERF-VERSION-GEN
    +++ b/tools/perf/util/PERF-VERSION-GEN
    @@ -12,7 +12,7 @@ LF='
    # First check if there is a .git to get the version from git describe
    # otherwise try to get the version from the kernel makefile
    if test -d ../../.git -o -f ../../.git &&
    - VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
    + VN=$(git describe --match 'v[0-9].[0-9]*' --abbrev=4 HEAD 2>/dev/null) &&
    case "$VN" in
    *$LF*) (exit 1) ;;
    v[0-9]*)
    --
    1.7.1


    \
     
     \ /
      Last update: 2012-06-02 00:41    [W:0.027 / U:32.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site