summaryrefslogtreecommitdiffstats
path: root/scripts/package
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2022-11-15 23:04:53 +0100
committerMasahiro Yamada <masahiroy@kernel.org>2022-11-17 09:51:45 +0100
commit5db8face97f81c9342458c052572e19ac6bd8e52 (patch)
treed5dd34813f8eeba31ac45e1a98f4cbbe858133e4 /scripts/package
parentMAINTAINERS: Add linux-kbuild's patchwork (diff)
downloadlinux-5db8face97f81c9342458c052572e19ac6bd8e52.tar.xz
linux-5db8face97f81c9342458c052572e19ac6bd8e52.zip
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 <maz@kernel.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts/package')
-rwxr-xr-xscripts/package/mkdebian2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 60a2a63a5e90..a3ac5a716e9f 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