From: Caleb Carlson <caleb.carlson@hpe.com>
Date: Tue, 28 May 2024 17:40:56 +0000 (-0600)
Subject: LU-17881 build: fix _flavor definition
X-Git-Tag: 2.15.64~116
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=3702ea1ca9278803ec742ad0791ec84762c158cf;p=fs%2Flustre-release.git

LU-17881 build: fix _flavor definition

Allow user to override _flavor definition.
Move ordering of _kver definition to be fully
defined before using it to define _flavor.
This prevents _flavor from getting defined with
the kernel patch version field.

Signed-off-by: Caleb Carlson <caleb.carlson@hpe.com>
Test-Parameters: trivial
HPE-bug-id: LUS-12267
Change-Id: Ibd4db360d8c16f487453593cb0a9fd2a6a5a8c62
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55225
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index 386a7ec..336c7bd 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -80,16 +80,18 @@
 %{!?kdir:    %global kdir    /lib/modules/%{_kver}/source}
 %{!?kobjdir: %global kobjdir %(if [ "%{kdir}" = "/lib/modules/%{_kver}/source" ]; then echo "/lib/modules/%{_kver}/build"; else echo "%{kdir}"; fi)}
 
+%if %{defined _take_kver}
+# as an alternative to this implementation we could simply "make -C $kdir kernelversion"
+%global kver %(files="include/generated/utsrelease.h include/linux/utsrelease.h include/linux/version.h"; for f in $files; do if test -r %{kobjdir}/$f && grep UTS_RELEASE %{kobjdir}/$f >/dev/null; then sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' %{kobjdir}/$f; break; fi; done)
+%define _kver %kver
+%endif
+
+%if %{undefined _flavor}
 %if 0%{?suse_version} >= 1310 && %{defined _take_kobj}
 	%global _flavor %(echo %{_kver} | sed -e 's/^.*-//')
 %else
 	%global _flavor default
 %endif
-
-%if %{defined _take_kver}
-# as an alternative to this implementation we could simply "make -C $kdir kernelversion"
-%global kver %(files="include/generated/utsrelease.h include/linux/utsrelease.h include/linux/version.h"; for f in $files; do if test -r %{kobjdir}/$f && grep UTS_RELEASE %{kobjdir}/$f >/dev/null; then sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' %{kobjdir}/$f; break; fi; done)
-%define _kver %kver
 %endif
 
 # We set this because kernel_module_package has its own method of identifying