Skip to content

Commit

Permalink
Makefile: "make kernelrelease" should show the correct full kernel ve…
Browse files Browse the repository at this point in the history
…rsion

After commit 85a256d, '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>
  • Loading branch information
Amerigo Wang authored and Michal Marek committed Jun 29, 2010
1 parent 8af8b28 commit 01ab178
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 01ab178

Please sign in to comment.