Skip to content

Commit 7e75291

Browse files
committed
kbuild: deb-pkg: fix versioning for -rc releases
The version number with -rc should be considered older than the final release. For example, 6.14-rc1 should be older than 6.14, but to handle this correctly (just like Debian kernel), "-rc" must be replace with "~rc". $ dpkg --compare-versions 6.14-rc1 lt 6.14 $ echo $? 1 $ dpkg --compare-versions 6.14~rc1 lt 6.14 $ echo $? 0 Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
1 parent 82e7a59 commit 7e75291

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

scripts/package/mkdebian

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ version=$KERNELRELEASE
161161
if [ "${KDEB_PKGVERSION:+set}" ]; then
162162
packageversion=$KDEB_PKGVERSION
163163
else
164-
packageversion=$(${srctree}/scripts/setlocalversion --no-local ${srctree})-$($srctree/scripts/build-version)
164+
upstream_version=$("${srctree}/scripts/setlocalversion" --no-local "${srctree}" | sed 's/-\(rc[1-9]\)/~\1/')
165+
debian_revision=$("${srctree}/scripts/build-version")
166+
packageversion=${upstream_version}-${debian_revision}
165167
fi
166168
sourcename=${KDEB_SOURCENAME:-linux-upstream}
167169

0 commit comments

Comments
 (0)