From 02fc8af5b4281d8bce991ef441c5c7a78ba34db5 Mon Sep 17 00:00:00 2001 From: Kairui Song Date: Tue, 3 Jan 2023 00:45:00 +0800 Subject: [PATCH] dist: decouple dist from kernel release Upstream: no Make it recognize kernel dist better. Signed-off-by: Kairui Song --- dist/scripts/lib-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/scripts/lib-version.sh b/dist/scripts/lib-version.sh index dede30da6..cb7a248c0 100755 --- a/dist/scripts/lib-version.sh +++ b/dist/scripts/lib-version.sh @@ -463,12 +463,12 @@ prepare_kernel_ver() { krelease="$krelease.${KGIT_TESTBUILD_TAG//-/_}" fi - KERNEL_RELVER="$krelease${KDIST:+.$KDIST}" + KERNEL_RELVER="$krelease" fi KERNEL_NAME="kernel${KDIST:+-$KDIST}" KERNEL_MAJVER="$KVERSION.$KPATCHLEVEL.$KSUBLEVEL" - KERNEL_UNAMER="$KERNEL_MAJVER-$KERNEL_RELVER" + KERNEL_UNAMER="$KERNEL_MAJVER-$KERNEL_RELVER${KDIST:+.$KDIST}" if [[ $localversion ]]; then KERNEL_NAME="$KERNEL_NAME-$localversion"