Messages in this thread Patch in this message | | | From | Michal Marek <> | Subject | [PATCH v2 1/5] kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL | Date | Thu, 9 Jun 2011 16:57:24 +0200 |
| |
Omit the second dot for releases without SUBLEVEL. If PATCHLEVEL is also empty, only display VERSION.
Signed-off-by: Michal Marek <mmarek@suse.cz> --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile index afb8e0d..4fe9075 100644 --- a/Makefile +++ b/Makefile @@ -378,7 +378,7 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC -- 1.7.4.2
| |