summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2010-08-20 11:36:06 +0200
committerMichal Marek <mmarek@suse.cz>2010-08-20 13:55:56 +0200
commit7b8ea53d7f1865cd8f05dfb8f706a4ff5a72abcf (patch)
tree3cdfb27bac033c9612cebb0e71dccff3af54d6d9 /Makefile
parentMerge commit 'v2.6.36-rc1' into kbuild/rc-fixes (diff)
downloadlinux-7b8ea53d7f1865cd8f05dfb8f706a4ff5a72abcf.tar.xz
linux-7b8ea53d7f1865cd8f05dfb8f706a4ff5a72abcf.zip
makefile: not need to regenerate kernel.release file when make kernelrelease
Brice reported that 'kernelrelease' has a dependence on include/config/kernel.release, causes this file to be regenerated every time when invoke it. It doesn't have to. Reported-by: Brice Goglin <Brice.Goglin@inria.fr> Tested-by: Brice Goglin <Brice.Goglin@inria.fr> Signed-off-by: WANG Cong <amwang@redhat.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f3bdff8c8d78..25da2521dd41 100644
--- a/Makefile
+++ b/Makefile
@@ -1408,8 +1408,8 @@ checkstack:
$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
$(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
-kernelrelease: include/config/kernel.release
- @echo $(KERNELRELEASE)
+kernelrelease:
+ @echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"
kernelversion:
@echo $(KERNELVERSION)