From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Thu, 9 Aug 2018 15:11:02 -0400 (EDT)
Subject: [lttng-dev] [PATCH lttng-modules stable-2.x 1/2] Fix: Allow
 alphanumeric characters in SLE version
In-Reply-To: <20180809155656.7287-1-mjeanson@efficios.com>
References: <20180809155656.7287-1-mjeanson@efficios.com>
Message-ID: <600696930.475.1533841862736.JavaMail.zimbra@efficios.com>

Both merged into 2.9, 2.10, thanks!

Mathieu

----- On Aug 9, 2018, at 11:56 AM, Michael Jeanson mjeanson at efficios.com wrote:

> 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 <mjeanson at efficios.com>
> ---
> abi-sle-version.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/abi-sle-version.sh b/abi-sle-version.sh
> index 0bd65b1..59e7d67 100755
> --- a/abi-sle-version.sh
> +++ b/abi-sle-version.sh
> @@ -22,7 +22,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')"
> --
> 2.17.1

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com