diff options
author | Amerigo Wang <amwang@redhat.com> | 2010-06-27 22:45:21 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-06-29 08:05:35 -0400 |
commit | 01ab17887f4cdcb8bb5a5d1bc3b160d186e6e99b (patch) | |
tree | 71dae983615599e5972ea44b4452f0383964e2ae /Makefile | |
parent | 8af8b28326f2b4565705125506ce8947e08587b1 (diff) |
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>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -414,7 +414,7 @@ endif | |||
414 | no-dot-config-targets := clean mrproper distclean \ | 414 | no-dot-config-targets := clean mrproper distclean \ |
415 | cscope TAGS tags help %docs check% \ | 415 | cscope TAGS tags help %docs check% \ |
416 | include/linux/version.h headers_% \ | 416 | include/linux/version.h headers_% \ |
417 | kernelrelease kernelversion | 417 | kernelversion |
418 | 418 | ||
419 | config-targets := 0 | 419 | config-targets := 0 |
420 | mixed-targets := 0 | 420 | mixed-targets := 0 |
@@ -1395,9 +1395,9 @@ checkstack: | |||
1395 | $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \ | 1395 | $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \ |
1396 | $(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH) | 1396 | $(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH) |
1397 | 1397 | ||
1398 | kernelrelease: | 1398 | kernelrelease: include/config/kernel.release |
1399 | $(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \ | 1399 | @echo $(KERNELRELEASE) |
1400 | $(error kernelrelease not valid - run 'make prepare' to update it)) | 1400 | |
1401 | kernelversion: | 1401 | kernelversion: |
1402 | @echo $(KERNELVERSION) | 1402 | @echo $(KERNELVERSION) |
1403 | 1403 | ||