Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

kbuild: Restore .version auto-increment behaviour for Debian packages

Browse Source 
Since 2df8220cc5 ("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: 2df8220cc5 ("kbuild: build init/built-in.a just once")
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Marc Zyngier 2022-11-15 22:04:53 +00:00 committed by Masahiro Yamada
parent 26e01ee19b
commit 5db8face97
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/package/mkdebian
View File

@ -90,7 +90,7 @@ if [ -n "$KDEB_PKGVERSION" ]; then
packageversion=$KDEB_PKGVERSION packageversion=$KDEB_PKGVERSION
revision=${packageversion##*-} revision=${packageversion##*-}
else else
revision=$(cat .version 2>/dev/null||echo 1) revision=$($srctree/init/build-version)
packageversion=$version-$revision packageversion=$version-$revision
fi fi
sourcename=$KDEB_SOURCENAME sourcename=$KDEB_SOURCENAME