diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-07-02 11:56:52 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-07-02 11:56:52 +0200 |
| commit | 62052be3a797f26f6f0fe30fc8d7f40ab54e08fd (patch) | |
| tree | bfdd68b770778dfaade57a51c0e8f6938f14c6f6 /scripts/package | |
| parent | kbuild: fix LOCALVERSION handling to match description (diff) | |
| parent | kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion (diff) | |
| download | linux-62052be3a797f26f6f0fe30fc8d7f40ab54e08fd.tar.xz linux-62052be3a797f26f6f0fe30fc8d7f40ab54e08fd.zip | |
Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes
Conflicts:
Makefile
Diffstat (limited to 'scripts/package')
| -rw-r--r-- | scripts/package/Makefile | 2 |
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 |