Whamcloud - gitweb
LU-12511 build: include firewalld files for native Linux client 79/51379/3
authorJames Simmons <jsimmons@infradead.org>
Tue, 20 Jun 2023 13:36:27 +0000 (09:36 -0400)
committerOleg Drokin <green@whamcloud.com>
Sat, 8 Jul 2023 22:33:47 +0000 (22:33 +0000)
Build rpms for the native Linux client fails due to xml files for
firewalld not being packaged. These files are useful for the
native client support so package them in that case.

Test-Parameters: trivial
Fixes: 9cb4b10c87d2 ("LU-14224 misc: add firewalld service configuration")
Change-Id: Id2887cef2c9b5e5d27fca3f77589775a31ee94b1
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51379
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
lustre.spec.in

index aa0d2be..75cc484 100644 (file)
@@ -722,8 +722,8 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre ] ; then
 fi
 %endif
 
-%if %{with lustre_modules}
 echo '%{_prefix}/lib/firewalld/services/*.xml' >>lustre.files
+%if %{with lustre_modules}
 # mark modules executable for find-debuginfo.sh
 find $RPM_BUILD_ROOT/lib/modules -name \*.ko -type f -exec chmod u+x {} \;
 %endif