Skip to content

Commit

Permalink
kbuild: Fix off-by-one error when generate a new version
Browse files Browse the repository at this point in the history
When build on, for example, x86 using `make O=... -j64` the version
in the built kernel comes from include/generated/compile.h, which is:

	#define UTS_VERSION "torvalds#351 SMP Fri Jan 24 18:46:34 EET 2020"

While at the end the x86 specific Makefile prints the contents of
the .version file:

	Kernel: arch/x86/boot/bzImage is ready  (torvalds#352)

Obviously the latter is not true. This happens because we first
check compile.h and update it and then generate new version, which is
incorrect flow:

  CHK     include/generated/compile.h
  UPD     include/generated/compile.h
  ...
  GEN     .version

In order to fix this, move the version generation from link-vmlinux.sh
to scripts/version.sh and re-use it in init/Makefile.

Additionally provide a unified way to get the current version of the build
and use this in few callers. This will respect the KBUILD_BUILD_VERSION
in case it's provided.

Signed-off-by: Andy Shevchenko <[email protected]>
  • Loading branch information
andy-shev authored and intel-lab-lkp committed Jan 25, 2020
1 parent 6d5a828 commit c66b9bc
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 22 deletions.
4 changes: 2 additions & 2 deletions arch/microblaze/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ linux.bin.ub linux.bin.gz: linux.bin
linux.bin: vmlinux
linux.bin linux.bin.gz linux.bin.ub:
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
@echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')'
@echo 'Kernel: $(boot)/$@ is ready' ' (#'`$(srctree)/scripts/kversion.sh --show`')'

PHONY += simpleImage.$(DTB)
simpleImage.$(DTB): vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(addprefix $(boot)/$@., ub unstrip strip)
@echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')'
@echo 'Kernel: $(boot)/$@ is ready' ' (#'`$(srctree)/scripts/kversion.sh --show`')'

define archhelp
echo '* linux.bin - Create raw binary'
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin \

$(obj)/bzImage: $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/tools/build FORCE
$(call if_changed,image)
@$(kecho) 'Kernel: $@ is ready' ' (#'`cat .version`')'
@$(kecho) 'Kernel: $@ is ready' ' (#'`$(srctree)/scripts/kversion.sh --show`')'

OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note -R .comment -S
$(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
Expand Down
8 changes: 7 additions & 1 deletion init/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,14 @@ $(obj)/version.o: include/generated/compile.h
chk_compile.h = :
quiet_chk_compile.h = echo ' CHK $@'
silent_chk_compile.h = :
include/generated/compile.h: FORCE
include/generated/compile.h: kversion FORCE
@$($(quiet)chk_compile.h)
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" \
"$(CONFIG_PREEMPT_RT)" "$(CC) $(KBUILD_CFLAGS)"

quiet_cmd_kversion = CALL $<
cmd_kversion = $(CONFIG_SHELL) $< --update

kversion: $(srctree)/scripts/kversion.sh FORCE
$(call cmd,kversion)
45 changes: 45 additions & 0 deletions scripts/kversion.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#!/bin/sh -e

show_version() {
local dotversion="$1"; shift

# Check if special build version is requested
if [ -n "$KBUILD_BUILD_VERSION" ]; then
echo "$KBUILD_BUILD_VERSION"
else
cat $dotversion 2>/dev/null || echo 1
fi
}

update_version() {
local dotversion="$1"; shift

# Don't update local version if special build version is requested
if [ -n "$KBUILD_BUILD_VERSION" ]; then return; fi

if [ -r $dotversion ]; then
local version="$(expr 0$(cat $dotversion) + 1)"
echo "$version" > $dotversion
else
rm -f $dotversion
echo "1" > $dotversion
fi
}

VERSION_FILE_NAME=".version"

show=
update=
while [ "$#" -ge "1" ]; do
case "$1" in
--show) show=1 ;;
--update) update=1 ;;
--) break ;;
esac
shift
done

if [ -n "$1" ]; then VERSION_FILE_NAME="$1"; fi

if [ -n "$show" ]; then show_version "$VERSION_FILE_NAME"; fi
if [ -n "$update" ]; then update_version "$VERSION_FILE_NAME"; fi
10 changes: 0 additions & 10 deletions scripts/link-vmlinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,6 @@ fi
# We need access to CONFIG_ symbols
. include/config/auto.conf

# Update version
info GEN .version
if [ -r .version ]; then
VERSION=$(expr 0$(cat .version) + 1)
echo $VERSION > .version
else
rm -f .version
echo 1 > .version
fi;

# final build of init/
${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init

Expand Down
9 changes: 3 additions & 6 deletions scripts/mkcompile_h
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ set -f
LC_ALL=C
export LC_ALL

if [ -z "$KBUILD_BUILD_VERSION" ]; then
VERSION=$(cat .version 2>/dev/null || echo 1)
else
VERSION=$KBUILD_BUILD_VERSION
fi

if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then
TIMESTAMP=`date`
else
Expand All @@ -50,7 +44,10 @@ else
LINUX_COMPILE_HOST=$KBUILD_BUILD_HOST
fi

VERSION=$($srctree/scripts/kversion.sh --show)

UTS_VERSION="#$VERSION"

CONFIG_FLAGS=""
if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/package/mkdebian
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ if [ -n "$KDEB_PKGVERSION" ]; then
packageversion=$KDEB_PKGVERSION
revision=${packageversion##*-}
else
revision=$(cat .version 2>/dev/null||echo 1)
revision=$($srctree/scripts/kversion.sh --show)
packageversion=$version-$revision
fi
sourcename=$KDEB_SOURCENAME
Expand Down
2 changes: 1 addition & 1 deletion scripts/package/mkspec
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
Name: kernel
Summary: The Linux Kernel
Version: $__KERNELRELEASE
Release: $(cat .version 2>/dev/null || echo 1)
Release: $($srctree/scripts/kversion.sh --show)
License: GPL
Group: System Environment/Kernel
Vendor: The Linux Community
Expand Down

0 comments on commit c66b9bc

Please sign in to comment.