summaryrefslogtreecommitdiffstats
path: root/scripts/package/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-04 19:55:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-04 19:55:23 -0700
commit404504470177d5ca1b46db5197ee0b78d639a2eb (patch)
treefe589d5017b199094920decd8283f748c4d668be /scripts/package/Makefile
parent123f94f22e3d283dfe68742b269c245b0501ad82 (diff)
parent62052be3a797f26f6f0fe30fc8d7f40ab54e08fd (diff)
downloadblackbird-op-linux-404504470177d5ca1b46db5197ee0b78d639a2eb.tar.gz
blackbird-op-linux-404504470177d5ca1b46db5197ee0b78d639a2eb.zip
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion kbuild: Clean up and speed up the localversion logic
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 62fcc3a7f4d3..3a681ef25306 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
OpenPOWER on IntegriCloud