openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michal Marek 2010-07-15 10:36:37 +02:00
parent 6dc0c2f338
commit b003afe32f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/package/Makefile
View File

@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE
fi fi
$(MAKE) clean $(MAKE) clean
$(PREV) ln -sf $(srctree) $(KERNELPATH) $(PREV) ln -sf $(srctree) $(KERNELPATH)
$(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --scm-only > $(objtree)/.scmversion $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
$(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
$(PREV) rm $(KERNELPATH) $(PREV) rm $(KERNELPATH)
rm -f $(objtree)/.scmversion rm -f $(objtree)/.scmversion

9
scripts/setlocalversion
View File

@ -10,13 +10,13 @@
# #
usage() { usage() {
echo "Usage: $0 [--scm-only] [srctree]" >&2 echo "Usage: $0 [--save-scmversion] [srctree]" >&2
exit 1 exit 1
} }
scm_only=false scm_only=false
srctree=. srctree=.
if test "$1" = "--scm-only"; then if test "$1" = "--save-scmversion"; then
scm_only=true scm_only=true
shift shift
fi fi
@ -132,7 +132,10 @@ collect_files()
} }
if $scm_only; then if $scm_only; then
scm_version if test ! -e .scmversion; then
res=$(scm_version)
echo "$res" >.scmversion
fi
exit exit
fi fi