From: Jian Yu Date: Sat, 11 Jun 2022 03:57:54 +0000 (-0700) Subject: LU-13562 build: get correct kernel flavor for SLES X-Git-Tag: 2.15.51~83 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0a2d42c7efc5378286d0e0b4255c3e108464fd47;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. 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 Reviewed-on: https://review.whamcloud.com/47594 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: Colin Faber Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- diff --git a/lustre.spec.in b/lustre.spec.in index dfbd282..24df136 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