From: Masahiro Yamada <masahiroy@kernel.org>
Date: Tue, 11 Mar 2025 19:01:33 +0000 (+0900)
Subject: kbuild: deb-pkg: fix versioning for -rc releases
X-Git-Tag: v6.15-rc1~11^2~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7e752910b8acd1527af34b51851998feb33cc028;p=linux-block.git

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>
---

diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 0178000197fe..07ca3528e8ea 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -161,7 +161,9 @@ version=$KERNELRELEASE
 if [ "${KDEB_PKGVERSION:+set}" ]; then
 	packageversion=$KDEB_PKGVERSION
 else
-	packageversion=$(${srctree}/scripts/setlocalversion --no-local ${srctree})-$($srctree/scripts/build-version)
+	upstream_version=$("${srctree}/scripts/setlocalversion" --no-local "${srctree}" | sed 's/-\(rc[1-9]\)/~\1/')
+	debian_revision=$("${srctree}/scripts/build-version")
+	packageversion=${upstream_version}-${debian_revision}
 fi
 sourcename=${KDEB_SOURCENAME:-linux-upstream}