| Message ID | 20200124195859.86991-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] kbuild: Fix off-by-one error when generate a new version | expand |
On Fri, Jan 24, 2020 at 09:58:59PM +0200, Andy Shevchenko wrote: > 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 "#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 (#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. Hmm... It looks like a mess in my build tree. I have to setup more experiments here.
Hi Andy, On Mon, Jan 27, 2020 at 7:05 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Fri, Jan 24, 2020 at 09:58:59PM +0200, Andy Shevchenko wrote: > > 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 "#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 (#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. > > Hmm... It looks like a mess in my build tree. > I have to setup more experiments here. > Sorry for the late reply. I remember I was also hit by this one month ago or so. I did not dig into it at that time because the problem disappeared after doing something. Today, I took a look at this again. This is a regression caused by 56d589361572 This patch should fix it: https://patchwork.kernel.org/patch/11374047/
On Mon, Feb 10, 2020 at 10:15 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > On Mon, Jan 27, 2020 at 7:05 PM Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > On Fri, Jan 24, 2020 at 09:58:59PM +0200, Andy Shevchenko wrote: ... > > > 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. I still think there is second part in my patch to be considered, i.e. see above. ... > I remember I was also hit by this one month ago or so. > > I did not dig into it at that time > because the problem disappeared after doing something. > > Today, I took a look at this again. > This is a regression caused by 56d589361572 > > This patch should fix it: > https://patchwork.kernel.org/patch/11374047/ Thank you.
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 7b340a35b194..eead2533e2b7 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -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' diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 9ba7557863e7..2ff13d835cb8 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -82,7 +82,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 diff --git a/init/Makefile b/init/Makefile index 6246a06364d0..f544aeb27901 100644 --- a/init/Makefile +++ b/init/Makefile @@ -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) diff --git a/scripts/kversion.sh b/scripts/kversion.sh new file mode 100755 index 000000000000..8d9000cd5b62 --- /dev/null +++ b/scripts/kversion.sh @@ -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 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 1919c311c149..c9a1b4f44f47 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -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 diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index 3a5a4b210c86..ef9085a63a04 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h @@ -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 @@ -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 diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 357dc56bcf30..a4ef9c6c7d35 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -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 diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 8640c278f1aa..0039eb9d62bd 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -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
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 "#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 (#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 <andriy.shevchenko@linux.intel.com> --- arch/microblaze/Makefile | 4 ++-- arch/x86/boot/Makefile | 2 +- init/Makefile | 8 ++++++- scripts/kversion.sh | 45 ++++++++++++++++++++++++++++++++++++++++ scripts/link-vmlinux.sh | 10 --------- scripts/mkcompile_h | 9 +++----- scripts/package/mkdebian | 2 +- scripts/package/mkspec | 2 +- 8 files changed, 60 insertions(+), 22 deletions(-) create mode 100755 scripts/kversion.sh