From 62ad24cd92ef2f2333aa372902a7842580867467 Mon Sep 17 00:00:00 2001
From: James Simmons <jsimmons@infradead.org>
Date: Sun, 26 Apr 2020 11:12:14 -0400
Subject: [PATCH] LU-12511 build: avoid building rpm with --disable-modules

If you configure lustre with --disable-modules this will prevent
OpenSFS lustre modules from being built but make rpms will fail
since it still expects built modules. Update the lustre.spec
file to not package any modules when --disable-modules is set.

Test-Parameters: trivial
Change-Id: Ide8d80f5b36f819b486a143e56daf494e6a1fe23
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/38369
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 lustre.spec.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lustre.spec.in b/lustre.spec.in
index 246122a..c51024b 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -444,6 +444,7 @@ make %{?_smp_mflags} -s %{?make_args}
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with lustre_modules}
 # RHEL's kernel_module_path macro expects that all the modules
 # in a kmod package will be in modules_fs_path/<sub packagename>
 # but Lustre installs all of the modules in a single pass into
@@ -467,6 +468,7 @@ mv $basemodpath/fs/llog_test.ko $basemodpath-tests/fs/llog_test.ko
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/lustre/tests/kernel/
 mv $basemodpath/fs/kinode.ko $RPM_BUILD_ROOT%{_libdir}/lustre/tests/kernel/
 %endif
+%endif
 
 :> lustre.files
 
-- 
1.8.3.1