kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion
authorMichal Marek <mmarek@suse.cz>
Wed, 30 Jun 2010 14:41:23 +0000 (16:41 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 30 Jun 2010 14:41:23 +0000 (16:41 +0200)
Variables given on the make commandline are not exported to $(shell
...) commands, so run the setlocalversion script in the make rule
directly.

Signed-off-by: Michal Marek <mmarek@suse.cz>
Makefile

index a86ac8c4798e00f6fcccf19ca4edf4202d517d69..12ab17511308cffa7dfb00c179c6577d6770e648 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -884,11 +884,9 @@ $(vmlinux-dirs): prepare scripts
        $(Q)$(MAKE) $(build)=$@
 
 # Store (new) KERNELRELASE string in include/config/kernel.release
-localversion = $(shell $(CONFIG_SHELL) \
-              $(srctree)/scripts/setlocalversion $(srctree))
 include/config/kernel.release: include/config/auto.conf FORCE
        $(Q)rm -f $@
-       $(Q)echo $(KERNELVERSION)$(localversion) > $@
+       $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@
 
 
 # Things we need to do before we recursively start building the kernel