diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-07-02 05:56:52 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-07-02 05:56:52 -0400 |
| commit | 62052be3a797f26f6f0fe30fc8d7f40ab54e08fd (patch) | |
| tree | bfdd68b770778dfaade57a51c0e8f6938f14c6f6 /scripts/package | |
| parent | d5eda75f3a6a08f5a3644764a88d288e62e7823d (diff) | |
| parent | 0a564b2645c8766a669c55bde1f1ef5b0518caec (diff) | |
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 | |||
| 44 | fi | 44 | fi |
| 45 | $(MAKE) clean | 45 | $(MAKE) clean |
| 46 | $(PREV) ln -sf $(srctree) $(KERNELPATH) | 46 | $(PREV) ln -sf $(srctree) $(KERNELPATH) |
| 47 | $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion > $(objtree)/.scmversion | 47 | $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --scm-only > $(objtree)/.scmversion |
| 48 | $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. | 48 | $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. |
| 49 | $(PREV) rm $(KERNELPATH) | 49 | $(PREV) rm $(KERNELPATH) |
| 50 | rm -f $(objtree)/.scmversion | 50 | rm -f $(objtree)/.scmversion |