From b9033a78a0acf454dd6afcbeecafc84b47151abb Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@novell.com>
Date: Thu, 8 Sep 2005 17:07:35 +0200
Subject: [PATCH] --- yaml --- r: 8445 b: refs/heads/master c:
 4e25d8bb9550fb5912165196fe8502cdb831a336 h: refs/heads/master i:   8443:
 8437119336313721620e1cb7a40fa18507adecd9 v: v3

---
 [refs]         |  2 +-
 trunk/Makefile | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 469c63666e84..1a6a6154d111 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b49bb9aff8b14d15da58111d8908c877c0a525e
+refs/heads/master: 4e25d8bb9550fb5912165196fe8502cdb831a336
diff --git a/trunk/Makefile b/trunk/Makefile
index 6a405882b1f7..485a11a1985f 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -641,8 +641,13 @@ quiet_cmd_vmlinux__ ?= LD      $@
 # Generate new vmlinux version
 quiet_cmd_vmlinux_version = GEN     .version
       cmd_vmlinux_version = set -e;                     \
-	. $(srctree)/scripts/mkversion > .tmp_version;	\
-	mv -f .tmp_version .version;			\
+	if [ ! -r .version ]; then			\
+	  rm -f .version;				\
+	  echo 1 >.version;				\
+	else						\
+	  mv .version .old_version;			\
+	  expr 0$$(cat .old_version) + 1 >.version;	\
+	fi;						\
 	$(MAKE) $(build)=init
 
 # Generate System.map
@@ -756,6 +761,7 @@ endif # ifdef CONFIG_KALLSYMS
 # vmlinux image - including updated kernel symbols
 vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
 	$(call if_changed_rule,vmlinux__)
+	$(Q)rm -f .old_version
 
 # The actual objects are generated when descending, 
 # make sure no implicit rule kicks in