Conflicts: tools/perf/Makefile tools/perf/util/hist.c Merge reason: Resolve the conflicts and update to latest upstream.
Showing the changes to scripts (3 of 209 files). Show all
Unified · Split
| @@ -226,7 +226,7 @@ void fill_window(WINDOW *win, const char *text) · 225 unmodified lines | ||
| 226 | 226 | int len = get_line_length(line); |
| 227 | 227 | strncpy(tmp, line, min(len, x)); |
| 228 | 228 | tmp[len] = '\0'; |
| 229 | − mvwprintw(win, i, 0, tmp); | |
| 229 | + mvwprintw(win, i, 0, "%s", tmp); | |
| 230 | 230 | } |
| 231 | 231 | } |
| 232 | 232 | |
| @@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE · 43 unmodified lines | ||
| 44 | 44 | fi |
| 45 | 45 | $(MAKE) clean |
| 46 | 46 | $(PREV) ln -sf $(srctree) $(KERNELPATH) |
| 47 | − $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --scm-only > $(objtree)/.scmversion | |
| 47 | + $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion | |
| 48 | 48 | $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. |
| 49 | 49 | $(PREV) rm $(KERNELPATH) |
| 50 | 50 | rm -f $(objtree)/.scmversion |
| @@ -10,13 +10,13 @@ · 9 unmodified lines | ||
| 10 | 10 | # |
| 11 | 11 | |
| 12 | 12 | usage() { |
| 13 | − echo "Usage: $0 [--scm-only] [srctree]" >&2 | |
| 13 | + echo "Usage: $0 [--save-scmversion] [srctree]" >&2 | |
| 14 | 14 | exit 1 |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | scm_only=false |
| 18 | 18 | srctree=. |
| 19 | −if test "$1" = "--scm-only"; then | |
| 19 | +if test "$1" = "--save-scmversion"; then | |
| 20 | 20 | scm_only=true |
| 21 | 21 | shift |
| 22 | 22 | fi |
| @@ -30,11 +30,12 @@ fi · 7 unmodified lines | ||
| 30 | 30 | |
| 31 | 31 | scm_version() |
| 32 | 32 | { |
| 33 | − local short=false | |
| 33 | + local short | |
| 34 | + short=false | |
| 34 | 35 | |
| 35 | 36 | cd "$srctree" |
| 36 | 37 | if test -e .scmversion; then |
| 37 | − cat "$_" | |
| 38 | + cat .scmversion | |
| 38 | 39 | return |
| 39 | 40 | fi |
| 40 | 41 | if test "$1" = "--short"; then |
| @@ -131,12 +132,15 @@ collect_files() · 90 unmodified lines | ||
| 131 | 132 | } |
| 132 | 133 | |
| 133 | 134 | if $scm_only; then |
| 134 | − scm_version | |
| 135 | + if test ! -e .scmversion; then | |
| 136 | + res=$(scm_version) | |
| 137 | + echo "$res" >.scmversion | |
| 138 | + fi | |
| 135 | 139 | exit |
| 136 | 140 | fi |
| 137 | 141 | |
| 138 | 142 | if test -e include/config/auto.conf; then |
| 139 | − source "$_" | |
| 143 | + . include/config/auto.conf | |
| 140 | 144 | else |
| 141 | 145 | echo "Error: kernelrelease not valid - run 'make prepare' to update it" |
| 142 | 146 | exit 1 |