From: Michael Jeanson Date: Thu, 9 Aug 2018 15:55:31 +0000 (-0400) Subject: Fix: Allow alphanumeric characters in SLE version X-Git-Tag: v2.11.0-rc1~10 X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=8fca602a71eb37b43aabbb88c47a577272ed75b0 Fix: Allow alphanumeric characters in SLE version Allow alphanumeric characters in the long version string before extracting specific version numbers. This prevents failure in detecting a SuSE kernel when the version string was customized by the end user. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- diff --git a/scripts/abi-sle-version.sh b/scripts/abi-sle-version.sh index bd6d5f1d..aafed7c1 100755 --- a/scripts/abi-sle-version.sh +++ b/scripts/abi-sle-version.sh @@ -23,7 +23,7 @@ if [ ! -f "${KPATH}/include/generated/utsrelease.h" ]; then exit 0 fi -SLE_RELEASE="$(sed -rn 's/^#define UTS_RELEASE "(.*)-([0-9\.]+)-(.*)"/\2/p' "${KPATH}/include/generated/utsrelease.h")" +SLE_RELEASE="$(sed -rn 's/^#define UTS_RELEASE "(.*)-([0-9a-zA-Z\.]+)-(.*)"/\2/p' "${KPATH}/include/generated/utsrelease.h")" SLE_RELEASE_MAJOR="$(echo "${SLE_RELEASE}" | sed -rn 's/^([0-9]+)(.*)$/\1/p')" SLE_RELEASE_MINOR="$(echo "${SLE_RELEASE}" | sed -rn 's/^([0-9]+)\.([0-9]+)(.*)$/\2/p')"