Both merged into master, thanks!
Mathieu
----- On Aug 9, 2018, at 11:55 AM, Michael Jeanson mjean...@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 <mjean...@efficios.com>
> ---
> scripts/abi-sle-version.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/abi-sle-version.sh b/scripts/abi-sle-version.sh
> index bd6d5f1..aafed7c 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')"
> --
> 2.17.1
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
