diff options
| author |   Masahiro Yamada <masahiroy@kernel.org> | 2025-03-12 04:01:33 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2025-03-22 23:50:58 +0900 |
| commit | 7e752910b8acd1527af34b51851998feb33cc028 (patch) | |
| tree | c29d85018bbe88ee222367a0e8a712fa259796fa | |
| parent | Documentation/kbuild: Fix indentation in modules.rst example (diff) | |
| download | wireguard-linux-7e752910b8acd1527af34b51851998feb33cc028.tar.xz wireguard-linux-7e752910b8acd1527af34b51851998feb33cc028.zip | |
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>
| -rwxr-xr-x | scripts/package/mkdebian | 4 |
1 files changed, 3 insertions, 1 deletions
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} |