From cdf4b41ca89d7ea2c887f19976e492606ec68139 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 9 Feb 2021 11:25:57 -0500 Subject: [PATCH] fix: Add one digit to SLES minor release version Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: I02c9ad7ecae6dc41a10d9e2868382eaa6006e076 --- lttng-kernel-version.h | 4 ++-- scripts/abi-sle-version.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h index 9ce339b1..45aab6ed 100644 --- a/lttng-kernel-version.h +++ b/lttng-kernel-version.h @@ -132,11 +132,11 @@ /* SUSE Linux enterprise */ #define LTTNG_SLE_KERNEL_VERSION(a, b, c, d, e, f) \ - (((LTTNG_KERNEL_VERSION(a, b, c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f)) + (((LTTNG_KERNEL_VERSION(a, b, c)) * 100000000ULL) + ((d) * 100000) + ((e) * 100) + (f)) #ifdef SLE_API_VERSION #define LTTNG_SLE_VERSION_CODE \ - ((LTTNG_LINUX_VERSION_CODE * 10000000ULL) + SLE_API_VERSION) + ((LTTNG_LINUX_VERSION_CODE * 100000000ULL) + SLE_API_VERSION) #else #define LTTNG_SLE_VERSION_CODE 0 #endif diff --git a/scripts/abi-sle-version.sh b/scripts/abi-sle-version.sh index aafed7c1..5be62f21 100755 --- a/scripts/abi-sle-version.sh +++ b/scripts/abi-sle-version.sh @@ -38,6 +38,6 @@ if [ "x$SLE_RELEASE_PATCH" = "x" ]; then fi # Combine all update numbers into one -SLE_API_VERSION="$((SLE_RELEASE_MAJOR * 10000 + SLE_RELEASE_MINOR * 100 + SLE_RELEASE_PATCH))" +SLE_API_VERSION="$((SLE_RELEASE_MAJOR * 100000 + SLE_RELEASE_MINOR * 100 + SLE_RELEASE_PATCH))" echo ${SLE_API_VERSION} -- 2.34.1