diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-07-15 04:36:37 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-07-21 10:06:05 -0400 |
| commit | b003afe32f608b8d9f9a898b36514dfbf374fd3a (patch) | |
| tree | 1a2da53522eeecafc843a37ffd4ff5663e61a46e /scripts/package | |
| parent | 6dc0c2f3384fe543a805922c6a314c7ad25a92fc (diff) | |
kbuild: Fix make rpm
make rpm was broken by commit 0915512:
make clean
set -e; cd ..; ln -sf /usr/src/iwlwifi-2.6 kernel-2.6.35rc4wl
/bin/sh /usr/src/iwlwifi-2.6/scripts/setlocalversion --scm-only >
/usr/src/iwlwifi-2.6/.scmversion
cat: .scmversion: input file is output file
make[1]: *** [rpm] Error 1
Reported-and-tested-by: "Zheng, Jiajia" <jiajia.zheng@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
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 3a681ef25306..d2c29b63adda 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 --scm-only > $(objtree)/.scmversion | 47 | $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-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 |