From: Marc Zyngier Date: Tue, 15 Nov 2022 22:04:53 +0000 (+0000) Subject: kbuild: Restore .version auto-increment behaviour for Debian packages X-Git-Tag: v6.1~100^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5db8face97f81c9342458c052572e19ac6bd8e52;p=platform%2Fkernel%2Flinux-starfive.git kbuild: Restore .version auto-increment behaviour for Debian packages Since 2df8220cc511 ("kbuild: build init/built-in.a just once"), generating Debian packages using 'make bindeb-pkg' results in packages that are stuck to the same .version, leading to unexpected behaviours (multiple packages with the same version). That's because the mkdebian script samples the build version before building the kernel, and forces the use of that version number for the actual build. Restore the previous behaviour by calling init/build-version instead of reading the .version file. This is likely to result in too many .version bumps, but this is what was happening before (although the bump was affecting builds made after the current one). Fixes: 2df8220cc511 ("kbuild: build init/built-in.a just once") Signed-off-by: Marc Zyngier Signed-off-by: Masahiro Yamada --- diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 60a2a63..a3ac5a7 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/init/build-version) packageversion=$version-$revision fi sourcename=$KDEB_SOURCENAME