Skip to content

Commit 5db8fac

Browse files
Marc Zyngiermasahir0y
authored andcommitted
kbuild: Restore .version auto-increment behaviour for Debian packages
Since 2df8220 ("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: 2df8220 ("kbuild: build init/built-in.a just once") Signed-off-by: Marc Zyngier <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 26e01ee commit 5db8fac

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/package/mkdebian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ if [ -n "$KDEB_PKGVERSION" ]; then
9090
packageversion=$KDEB_PKGVERSION
9191
revision=${packageversion##*-}
9292
else
93-
revision=$(cat .version 2>/dev/null||echo 1)
93+
revision=$($srctree/init/build-version)
9494
packageversion=$version-$revision
9595
fi
9696
sourcename=$KDEB_SOURCENAME

0 commit comments

Comments
 (0)