From 9a085781b34d3dbe46c61db21c2681a0d31136de Mon Sep 17 00:00:00 2001 From: Alexey Lyashkov Date: Tue, 17 Mar 2020 17:05:11 +0300 Subject: [PATCH 1/1] LU-12214 build: fix make rpms Disable an mpi tests if host don't have any MPI implementation installed. libselinux should a soft dependence and rpm able to handle it internally, Change-Id: I09eaa825a086dd349699de287222e8dc14d1fd1a Signed-off-by: Alexey Lyashkov Reviewed-on: https://review.whamcloud.com/37954 Tested-by: jenkins Reviewed-by: James Simmons Reviewed-by: Shuichi Ihara Tested-by: Maloo Reviewed-by: Sebastien Buisson Reviewed-by: Oleg Drokin --- config/lustre-build.m4 | 3 +++ lustre.spec.in | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index 4f3ac4f..ed23616 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -576,6 +576,9 @@ fi if test x$enable_static != xyes ; then RPMBINARGS="$RPMBINARGS --without static" fi +if test x$enable_mpitests != xyes ; then + RPMBINARGS="$RPMBINARGS --without mpi" +fi RPMBUILD_BINARY_ARGS=$RPMBINARGS diff --git a/lustre.spec.in b/lustre.spec.in index 8869a50..246122a 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -184,7 +184,6 @@ Provides: lustre-client = %{version}-%{release} %if %{_vendor}=="redhat" || %{_vendor}=="fedora" #suse don't support selinux BuildRequires: libselinux-devel -Requires: libselinux %endif %if %{with lustre_modules} %if %{with mofed} -- 1.8.3.1