diff options
-rw-r--r-- | scripts/package/Makefile | 4 | ||||
-rwxr-xr-x | tools/perf/util/PERF-VERSION-GEN | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index a4f31c900fa6..c5d473393816 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile | |||
@@ -115,7 +115,9 @@ git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/ \ | |||
115 | -o $(perf-tar).tar; \ | 115 | -o $(perf-tar).tar; \ |
116 | mkdir -p $(perf-tar); \ | 116 | mkdir -p $(perf-tar); \ |
117 | git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \ | 117 | git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \ |
118 | tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ | 118 | (cd $(srctree)/tools/perf; \ |
119 | util/PERF-VERSION-GEN ../../$(perf-tar)/ 2>/dev/null); \ | ||
120 | tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \ | ||
119 | rm -r $(perf-tar); \ | 121 | rm -r $(perf-tar); \ |
120 | $(if $(findstring tar-src,$@),, \ | 122 | $(if $(findstring tar-src,$@),, \ |
121 | $(if $(findstring bz2,$@),bzip2, \ | 123 | $(if $(findstring bz2,$@),bzip2, \ |
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index ce7a804b2951..39f17507578d 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN | |||
@@ -19,6 +19,9 @@ if test -d ../../.git -o -f ../../.git | |||
19 | then | 19 | then |
20 | TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null ) | 20 | TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null ) |
21 | CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID" | 21 | CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID" |
22 | elif test -f ../../PERF-VERSION-FILE | ||
23 | then | ||
24 | TAG=$(cut -d' ' -f3 ../../PERF-VERSION-FILE | sed -e 's/\"//g') | ||
22 | fi | 25 | fi |
23 | if test -z "$TAG" | 26 | if test -z "$TAG" |
24 | then | 27 | then |