summaryrefslogtreecommitdiff
path: root/scripts/package/Makefile
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-07-02 09:56:52 (GMT)
committerMichal Marek <mmarek@suse.cz>2010-07-02 09:56:52 (GMT)
commit62052be3a797f26f6f0fe30fc8d7f40ab54e08fd (patch)
treebfdd68b770778dfaade57a51c0e8f6938f14c6f6 /scripts/package/Makefile
parentd5eda75f3a6a08f5a3644764a88d288e62e7823d (diff)
parent0a564b2645c8766a669c55bde1f1ef5b0518caec (diff)
downloadlinux-62052be3a797f26f6f0fe30fc8d7f40ab54e08fd.tar.xz
Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes
Conflicts: Makefile
Diffstat (limited to 'scripts/package/Makefile')
-rw-r--r--scripts/package/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 62fcc3a..3a681ef 100644
--- a/scripts/package/Makefile
+++ b/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 > $(objtree)/.scmversion
+ $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --scm-only > $(objtree)/.scmversion
$(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
$(PREV) rm $(KERNELPATH)
rm -f $(objtree)/.scmversion