Commit 0a564b2645c8766a669c55bde1f1ef5b0518caec

Authored by Michal Marek
1 parent 09155120cf

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>

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

... ... @@ -884,11 +884,9 @@
884 884 $(Q)$(MAKE) $(build)=$@
885 885  
886 886 # Store (new) KERNELRELASE string in include/config/kernel.release
887   -localversion = $(shell $(CONFIG_SHELL) \
888   - $(srctree)/scripts/setlocalversion $(srctree))
889 887 include/config/kernel.release: include/config/auto.conf FORCE
890 888 $(Q)rm -f $@
891   - $(Q)echo $(KERNELVERSION)$(localversion) > $@
  889 + $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@
892 890  
893 891  
894 892 # Things we need to do before we recursively start building the kernel