Makefile: "make kernelrelease" should show the correct full kernel version
authorAmerigo Wang <amwang@redhat.com>
Mon, 28 Jun 2010 02:45:21 +0000 (10:45 +0800)
committerMichal Marek <mmarek@suse.cz>
Tue, 29 Jun 2010 12:05:35 +0000 (14:05 +0200)
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>
Makefile

index a86ac8c..dceb4f1 100644 (file)
--- 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)