aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-06-30 16:41:23 +0200
committerMichal Marek <mmarek@suse.cz>2010-06-30 16:41:23 +0200
commit0a564b2645c8766a669c55bde1f1ef5b0518caec (patch)
tree1822010f2921a99ef9b7a286e4d8bff466427e58 /Makefile
parent09155120cf0ffe6f0c8aba3aa625831405b65996 (diff)
downloadlinux-2.6.34-ux500-0a564b2645c8766a669c55bde1f1ef5b0518caec.tar.gz
kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a86ac8c4798..12ab1751130 100644
--- 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