summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2010-06-28 04:45:21 +0200
committerMichal Marek <mmarek@suse.cz>2010-06-29 14:05:35 +0200
commit01ab17887f4cdcb8bb5a5d1bc3b160d186e6e99b (patch)
tree71dae983615599e5972ea44b4452f0383964e2ae
parentMerge branch 'setlocalversion-speedup' into kbuild/kbuild (diff)
downloadlinux-01ab17887f4cdcb8bb5a5d1bc3b160d186e6e99b.tar.xz
linux-01ab17887f4cdcb8bb5a5d1bc3b160d186e6e99b.zip
Makefile: "make kernelrelease" should show the correct full kernel version
After commit 85a256d8e0116c8f5ad276730830f5d4d473344d, 'make kernelrelease' doesn't show the correct full kernel version. This patch fixes it, 'make kernelrelease' will show the same version name with the one you finally get. Cc: David Rientjes <rientjes@google.com> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: Amerigo Wang <amwang@redhat.com> [mmarek: merged with 0915512 and added dependency on include/config/kernel.release] Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a86ac8c4798e..dceb4f19f786 100644
--- a/Makefile
+++ b/Makefile
@@ -414,7 +414,7 @@ endif
no-dot-config-targets := clean mrproper distclean \
cscope TAGS tags help %docs check% \
include/linux/version.h headers_% \
- kernelrelease kernelversion
+ kernelversion
config-targets := 0
mixed-targets := 0
@@ -1395,9 +1395,9 @@ checkstack:
$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
$(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
-kernelrelease:
- $(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \
- $(error kernelrelease not valid - run 'make prepare' to update it))
+kernelrelease: include/config/kernel.release
+ @echo $(KERNELRELEASE)
+
kernelversion:
@echo $(KERNELVERSION)