mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
[PATCH] kbuild: adjust .version updating
In order to maintain a more correct build number, updates to the version number should only be commited after a successful link of vmlinux, not before (so that errors in the link process don't lead to pointless increments). Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
parent
7b49bb9aff
commit
4e25d8bb95
10
Makefile
10
Makefile
|
@ -641,8 +641,13 @@ quiet_cmd_vmlinux__ ?= LD $@
|
|||
# Generate new vmlinux version
|
||||
quiet_cmd_vmlinux_version = GEN .version
|
||||
cmd_vmlinux_version = set -e; \
|
||||
. $(srctree)/scripts/mkversion > .tmp_version; \
|
||||
mv -f .tmp_version .version; \
|
||||
if [ ! -r .version ]; then \
|
||||
rm -f .version; \
|
||||
echo 1 >.version; \
|
||||
else \
|
||||
mv .version .old_version; \
|
||||
expr 0$$(cat .old_version) + 1 >.version; \
|
||||
fi; \
|
||||
$(MAKE) $(build)=init
|
||||
|
||||
# Generate System.map
|
||||
|
@ -756,6 +761,7 @@ endif # ifdef CONFIG_KALLSYMS
|
|||
# vmlinux image - including updated kernel symbols
|
||||
vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
|
||||
$(call if_changed_rule,vmlinux__)
|
||||
$(Q)rm -f .old_version
|
||||
|
||||
# The actual objects are generated when descending,
|
||||
# make sure no implicit rule kicks in
|
||||
|
|
Loading…
Reference in a new issue