Skip to contentSkip to conversation

kbuild: deb-pkg: fix versioning for -rc releases

PATCH In review Masahiro Yamada 2 participants 3 messages Mar 11, 2025 – Mar 12, 2025 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---

 scripts/package/mkdebian | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
scripts/package/mkdebian +3 -1
index 193e33bcb989..80ed96561993 100755
@@ -167,7 +167,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}
 
Signature · 1 line
2.43.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Masahiro Yamada

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

Quoted 8 lines
  $ dpkg --compare-versions 6.14-rc1 lt 6.14
  $ echo $?
  1
  $ dpkg --compare-versions 6.14~rc1 lt 6.14
  $ echo $?
  0
Quoted 10 lines

---

 scripts/package/mkdebian | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
scripts/package/mkdebian +0 -0
index 193e33bcb989..80ed96561993 100755

scripts/package/mkdebian version=$KERNELRELEASE · line 170

Quoted 5 lines
scripts/package/mkdebian +1 -1
@@ -167,7 +167,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/')

I don't think there has ever been an -rc10 but would it hurt to make it [1-9]+?

Quoted 8 lines
scripts/package/mkdebian +2 -0
+	debian_revision=$("${srctree}/scripts/build-version")
+	packageversion=${upstream_version}-${debian_revision}
 fi
 sourcename=${KDEB_SOURCENAME:-linux-upstream}
 
Signature · 1 line
2.43.0
#2 lore raw
Quoted 24 lines · Nathan Chancellor
Quoted 6 lines · Masahiro Yamada

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

Quoted 8 lines
  $ dpkg --compare-versions 6.14-rc1 lt 6.14
  $ echo $?
  1
  $ dpkg --compare-versions 6.14~rc1 lt 6.14
  $ echo $?
  0
Quoted 5 lines

---

 scripts/package/mkdebian | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 13 lines

scripts/package/mkdebian version=$KERNELRELEASE · line 170

Quoted 10 lines
scripts/package/mkdebian +1 -1
index 193e33bcb989..80ed96561993 100755
@@ -167,7 +167,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/')

I don't think there has ever been an -rc10 but would it hurt to make it [1-9]+?

The current code should work with -rc10 as well.

$ echo 6.14-rc10 | sed 's/-\(rc[1-9]\)/~\1/'
6.14~rc10
Signature · 2 lines
Best Regards
Masahiro Yamada