aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-06-30 10:41:23 -0400
committerMichal Marek <mmarek@suse.cz>2010-06-30 10:41:23 -0400
commit0a564b2645c8766a669c55bde1f1ef5b0518caec (patch)
tree1822010f2921a99ef9b7a286e4d8bff466427e58
parent09155120cf0ffe6f0c8aba3aa625831405b65996 (diff)
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>
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a86ac8c4798e..12ab17511308 100644
--- a/Makefile
+++ b/Makefile
@@ -884,11 +884,9 @@ $(vmlinux-dirs): prepare scripts
884 $(Q)$(MAKE) $(build)=$@ 884 $(Q)$(MAKE) $(build)=$@
885 885
886# Store (new) KERNELRELASE string in include/config/kernel.release 886# Store (new) KERNELRELASE string in include/config/kernel.release
887localversion = $(shell $(CONFIG_SHELL) \
888 $(srctree)/scripts/setlocalversion $(srctree))
889include/config/kernel.release: include/config/auto.conf FORCE 887include/config/kernel.release: include/config/auto.conf FORCE
890 $(Q)rm -f $@ 888 $(Q)rm -f $@
891 $(Q)echo $(KERNELVERSION)$(localversion) > $@ 889 $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@
892 890
893 891
894# Things we need to do before we recursively start building the kernel 892# Things we need to do before we recursively start building the kernel