History

Merge commit 'v2.6.35' into perf/core

Conflicts: tools/perf/Makefile tools/perf/util/hist.c Merge reason: Resolve the conflicts and update to latest upstream.

Ingo Molnar committed 16 years ago

Commit 3772b732 parents 9fc3af4 9fe6206209 files · +1509 −649Browse files

Showing the changes to scripts (3 of 209 files). Show all

Unified · Split

3 files
  1. scripts/kconfig/nconf.gui.c +1 −1
  2. scripts/package/Makefile +1 −1
  3. scripts/setlocalversion +10 −6
scripts/kconfig/nconf.gui.c+1−1
@@ -226,7 +226,7 @@ void fill_window(WINDOW *win, const char *text) · 225 unmodified lines
226 int len = get_line_length(line);226 int len = get_line_length(line);
227 strncpy(tmp, line, min(len, x));227 strncpy(tmp, line, min(len, x));
228 tmp[len] = '\0';228 tmp[len] = '\0';
229 mvwprintw(win, i, 0, tmp);229 mvwprintw(win, i, 0, "%s", tmp);
230 }230 }
231}231}
232 232
scripts/package/Makefile+1−1
@@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE · 43 unmodified lines
44 fi44 fi
45 $(MAKE) clean45 $(MAKE) clean
46 $(PREV) ln -sf $(srctree) $(KERNELPATH)46 $(PREV) ln -sf $(srctree) $(KERNELPATH)
47 $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --scm-only > $(objtree)/.scmversion47 $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
48 $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.48 $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
49 $(PREV) rm $(KERNELPATH)49 $(PREV) rm $(KERNELPATH)
50 rm -f $(objtree)/.scmversion50 rm -f $(objtree)/.scmversion
scripts/setlocalversion+10−6
@@ -10,13 +10,13 @@ · 9 unmodified lines
10#10#
11 11
12usage() {12usage() {
13 echo "Usage: $0 [--scm-only] [srctree]" >&213 echo "Usage: $0 [--save-scmversion] [srctree]" >&2
14 exit 114 exit 1
15}15}
16 16
17scm_only=false17scm_only=false
18srctree=.18srctree=.
19if test "$1" = "--scm-only"; then19if test "$1" = "--save-scmversion"; then
20 scm_only=true20 scm_only=true
21 shift21 shift
22fi22fi
@@ -30,11 +30,12 @@ fi · 7 unmodified lines
30 30
31scm_version()31scm_version()
32{32{
33 local short=false33 local short
34 short=false
34 35
35 cd "$srctree"36 cd "$srctree"
36 if test -e .scmversion; then37 if test -e .scmversion; then
37 cat "$_"38 cat .scmversion
38 return39 return
39 fi40 fi
40 if test "$1" = "--short"; then41 if test "$1" = "--short"; then
@@ -131,12 +132,15 @@ collect_files() · 90 unmodified lines
131}132}
132 133
133if $scm_only; then134if $scm_only; then
134 scm_version135 if test ! -e .scmversion; then
136 res=$(scm_version)
137 echo "$res" >.scmversion
138 fi
135 exit139 exit
136fi140fi
137 141
138if test -e include/config/auto.conf; then142if test -e include/config/auto.conf; then
139 source "$_"143 . include/config/auto.conf
140else144else
141 echo "Error: kernelrelease not valid - run 'make prepare' to update it"145 echo "Error: kernelrelease not valid - run 'make prepare' to update it"
142 exit 1146 exit 1