From 59003530298e0eadba21bc978fb53d5edc220c13 Mon Sep 17 00:00:00 2001
From: Michal Marek <mmarek@suse.cz>
Date: Thu, 15 Jul 2010 10:36:37 +0200
Subject: [PATCH] --- yaml --- r: 201185 b: refs/heads/master c:
 b003afe32f608b8d9f9a898b36514dfbf374fd3a h: refs/heads/master i:   201183:
 a7281b17f214d19ba07c6ca7cb01505f82069ee3 v: v3

---
 [refs]                         | 2 +-
 trunk/scripts/package/Makefile | 2 +-
 trunk/scripts/setlocalversion  | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 05a0fa2f196c..2c1eacb82ac6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dc0c2f3384fe543a805922c6a314c7ad25a92fc
+refs/heads/master: b003afe32f608b8d9f9a898b36514dfbf374fd3a
diff --git a/trunk/scripts/package/Makefile b/trunk/scripts/package/Makefile
index 3a681ef25306..d2c29b63adda 100644
--- a/trunk/scripts/package/Makefile
+++ b/trunk/scripts/package/Makefile
@@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE
 	fi
 	$(MAKE) clean
 	$(PREV) ln -sf $(srctree) $(KERNELPATH)
-	$(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --scm-only > $(objtree)/.scmversion
+	$(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
 	$(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
 	$(PREV) rm $(KERNELPATH)
 	rm -f $(objtree)/.scmversion
diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion
index a7b9f7607e13..64a9cb5556cd 100755
--- a/trunk/scripts/setlocalversion
+++ b/trunk/scripts/setlocalversion
@@ -10,13 +10,13 @@
 #
 
 usage() {
-	echo "Usage: $0 [--scm-only] [srctree]" >&2
+	echo "Usage: $0 [--save-scmversion] [srctree]" >&2
 	exit 1
 }
 
 scm_only=false
 srctree=.
-if test "$1" = "--scm-only"; then
+if test "$1" = "--save-scmversion"; then
 	scm_only=true
 	shift
 fi
@@ -132,7 +132,10 @@ collect_files()
 }
 
 if $scm_only; then
-	scm_version
+	if test ! -e .scmversion; then
+		res=$(scm_version)
+		echo "$res" >.scmversion
+	fi
 	exit
 fi