Whamcloud - gitweb
LU-13903 build: make lustre-devel buildable for Linux client
authorJames Simmons <jsimmons@infradead.org>
Tue, 31 Jan 2023 07:21:13 +0000 (23:21 -0800)
committerAndreas Dilger <adilger@whamcloud.com>
Thu, 16 Feb 2023 21:15:32 +0000 (21:15 +0000)
Recently a new lustre-devel rpm was created which always has a
dependency on the kernel detected by the kmod macros. This doesn't
work in the case of running a custom Linux kernel. Addreess this
by not making use of the kmod macros when only building the Lustre
utilies i.e configure --disable-modules.

Lustre-change: https://review.whamcloud.com/41188
Lustre-commit: d498d1b9cc1bd199e97af3817396fdcada44d655

Test-Parameters: trivial
Fixes: 16af4e5ed634 ("LU-9215 build: Re-add the lustre-devel package")
Signed-off-by: James Simmons <jsimmons@infradead.org>
Change-Id: I324fbaa0f5b03e2095b493f3d8e00b74ca64298a
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/49773
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
lustre.spec.in

index 3caadc3..60ac32e 100644 (file)
@@ -361,7 +361,9 @@ Summary: Lustre include headers
 Group: Development/Kernel
 Provides: lustre-devel = %{version}
 Requires: %{lustre_name} = %{version}
+%if %{with lustre_modules}
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
+%endif
 %if 0%{?suse_version} >= 1500
 Requires: libjson-c3
 BuildRequires: libjson-c-devel