From: Jian Yu <yujian@whamcloud.com>
Date: Fri, 24 Jun 2022 06:32:33 +0000 (-0700)
Subject: LU-13562 build: get correct kernel flavor for SLES
X-Git-Tag: 2.15.1-RC1~12
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F47754%2F4;p=fs%2Flustre-release.git

LU-13562 build: get correct kernel flavor for SLES

This patch fixes lustre.spec.in to get correct kernel flavor
for SLES when kobjdir is detected as /lib/modules/%{_kver}/build.

Lustre-change: https://review.whamcloud.com/47594
Lustre-commit: 0a2d42c7efc5378286d0e0b4255c3e108464fd47

Test-Parameters: trivial clientdistro=sles15sp3

Change-Id: I350032af383ea8b7f48accd93e5cd11c571e6620
Fixes: d746e64fe1 ("LU-13562 build: SUSE build support for azure, cray_ari_s")
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/47754
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index f7e1b41..3499a1b 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -65,7 +65,7 @@
 %{!?kobjdir: %global kobjdir %(if [ "%{kdir}" = "/lib/modules/%{_kver}/source" ]; then echo "/lib/modules/%{_kver}/build"; else echo "%{kdir}"; fi)}
 
 %if 0%{?suse_version} >= 1310 && %{defined _take_kobj}
-	%global _flavor %(basename "%{kobjdir}")
+	%global _flavor %(echo %{_kver} | sed -e 's/^.*-//')
 %else
 	%global _flavor default
 %endif