Commit b003afe3 authored by Michal Marek's avatar Michal Marek
Browse files

kbuild: Fix make rpm

make rpm was broken by commit 09155120

:
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: default avatar"Zheng, Jiajia" <jiajia.zheng@intel.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 6dc0c2f3
......@@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE
fi
$(MAKE) clean
$(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) rm $(KERNELPATH)
rm -f $(objtree)/.scmversion
......
......@@ -10,13 +10,13 @@
#
usage() {
echo "Usage: $0 [--scm-only] [srctree]" >&2
echo "Usage: $0 [--save-scmversion] [srctree]" >&2
exit 1
}
scm_only=false
srctree=.
if test "$1" = "--scm-only"; then
if test "$1" = "--save-scmversion"; then
scm_only=true
shift
fi
......@@ -132,7 +132,10 @@ collect_files()
}
if $scm_only; then
scm_version
if test ! -e .scmversion; then
res=$(scm_version)
echo "$res" >.scmversion
fi
exit
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment