From f77c82e1e5abaada7fa7615d25afb6f2133b8c15 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Mon, 27 Jun 2016 15:51:15 -0700 Subject: [PATCH] LU-8343 build: fix kmod_version on SLES 12 Starting SLES 12, the kernel-module-subpackage script added a 'k' in Provides string, here is the sample %package -n %{-n*}-kmp-%1 %define _this_kmp_version %{-v*}_k%(echo %2 | sed -r 'y/-/_/; \ %s/^(2\.6\.[0-9]+)_/\\1.0_/; # use 2.6.x.0 for mainline kernels') ... Provides: %{-n*}-kmp = %_this_kmp_version Change-Id: I5c4a8af03d70862aaca46e41b737a62491cc3cf7 Signed-off-by: Minh Diep Reviewed-on: http://review.whamcloud.com/21021 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin Reviewed-by: Christopher J. Morrone --- lustre.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lustre.spec.in b/lustre.spec.in index e12170f..c2b6ce1 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -94,7 +94,11 @@ %global requires_kmod_version %{version} %else #for Suse %global requires_kmod_name %{lustre_name}-kmp - %global requires_kmod_version %{version}_%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;') + %if 0%{?suse_version} >= 1200 + %global requires_kmod_version %{version}_k%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;') + %else + %global requires_kmod_version %{version}_%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;') + %endif %endif Summary: Lustre File System -- 1.8.3.1